Remove Profile* from TemplateURL

Remove TemplateURL::profile_.
Remove TemplateURLService::AddAndSetProfile which does nothing other than calling Add().
Merge TemplateURLService::GenerateSearchURLUsingTermsData and GenerateSearchURLUsingTermsData.

BUG=383283
TEST=git cl try
[email protected]

Review URL: https://codereview.chromium.org/338363004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277965 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index 399d034..8a0268f 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -109,7 +109,7 @@
     TemplateURLData data;
     data.SetURL("http://foo.com/url?bar={searchTerms}");
     data.new_tab_url = new_tab_page_url.spec();
-    TemplateURL* template_url = new TemplateURL(browser()->profile(), data);
+    TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership.
     template_url_service->Add(template_url);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);