Revert of Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne…

chrome/browser/search/instant_unittest_base.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search/instant_unittest_base.h"
 #include <string>
 
-#include "base/strings/utf_string_conversions.h"
+#include "base/basictypes.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 26 matching lines @@
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 void InstantUnitTestBase::SetUpWithoutQueryExtraction() {
   SetUpHelper();
 }
 #endif
 
 void InstantUnitTestBase::SetUserSelectedDefaultSearchProvider(
     const std::string& base_url) {
   TemplateURLData data;
-  data.SetKeyword(base::UTF8ToUTF16(base_url));
   data.SetURL(base_url + "url?bar={searchTerms}");
   data.instant_url = base_url +
       "instant?{google:omniboxStartMarginParameter}{google:forceInstantResults}"
       "foo=foo#foo=foo&strk";
   data.new_tab_url = base_url + "newtab";
   data.alternate_urls.push_back(base_url + "alt#quux={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
   TemplateURL* template_url = new TemplateURL(profile(), data);
   // Takes ownership of |template_url|.
@@ skipping 15 matching lines @@
       chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
       content::Source<Profile>(profile()->GetOriginalProfile()),
       content::Details<GoogleURLTracker::UpdatedDetails>(&details));
 }
 
 bool InstantUnitTestBase::IsInstantServiceObserver(
     InstantServiceObserver* observer) {
   return instant_service_->observers_.HasObserver(observer);
 }
 
-TestingProfile* InstantUnitTestBase::CreateProfile() {
-  TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
-  TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
-      profile, &TemplateURLServiceFactory::BuildInstanceFor);
-  return profile;
-}
-
 void InstantUnitTestBase::SetUpHelper() {
   BrowserWithTestWindowTest::SetUp();
 
+  TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
+      profile(), &TemplateURLServiceFactory::BuildInstanceFor);
   template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_);
 
   UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/");
   TestingPrefServiceSyncable* pref_service = profile()->GetTestingPrefService();
   pref_service->SetUserPref(prefs::kLastPromptedGoogleURL,
                             new base::StringValue("https://www.google.com/"));
   SetUserSelectedDefaultSearchProvider("{google:baseURL}");
   instant_service_ = InstantServiceFactory::GetForProfile(profile());
 }