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

chrome/browser/search/instant_service_unittest.cc

Index: chrome/browser/search/instant_service_unittest.cc
diff --git a/chrome/browser/search/instant_service_unittest.cc b/chrome/browser/search/instant_service_unittest.cc
index 760bb584f85ef257cdc459b1bf0507da85fc093f..0e9135cbc24b4d64a626ce5a0bd9b384442e6ad0 100644
--- a/chrome/browser/search/instant_service_unittest.cc
+++ b/chrome/browser/search/instant_service_unittest.cc
@@ -29,6 +29,7 @@
 class MockInstantServiceObserver : public InstantServiceObserver {
  public:
   MOCK_METHOD0(DefaultSearchProviderChanged, void());
+  MOCK_METHOD0(GoogleURLUpdated, void());
   MOCK_METHOD1(OmniboxStartMarginChanged, void(int));
 };
 
@@ -57,45 +58,24 @@
   scoped_ptr<MockInstantServiceObserver> instant_service_observer_;
 };
 
-class InstantServiceEnabledTest : public InstantServiceTest {
- protected:
-  virtual void SetUp() OVERRIDE {
-    ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-        "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
-    InstantServiceTest::SetUp();
-  }
-};
-
-TEST_F(InstantServiceEnabledTest, DispatchDefaultSearchProviderChanged) {
+TEST_F(InstantServiceTest, DispatchDefaultSearchProviderChanged) {
   EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
       .Times(1);
 
-  const std::string new_base_url = "https://bar.com/";
+  const std::string& new_base_url = "https://bar.com/";
   SetUserSelectedDefaultSearchProvider(new_base_url);
 }
 
-TEST_F(InstantServiceTest, DontDispatchGoogleURLUpdatedForNonGoogleURLs) {
-  EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
-      .Times(1);
-  const std::string new_dsp_url = "https://bar.com/";
-  SetUserSelectedDefaultSearchProvider(new_dsp_url);
-  testing::Mock::VerifyAndClearExpectations(instant_service_observer_.get());
+TEST_F(InstantServiceTest, DispatchGoogleURLUpdated) {
+  EXPECT_CALL(*instant_service_observer_.get(), GoogleURLUpdated()).Times(1);
 
-  EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
-      .Times(0);
-  const std::string new_base_url = "https://www.google.es/";
+  const std::string& new_base_url = "https://www.google.es/";
   NotifyGoogleBaseURLUpdate(new_base_url);
 }
 
-TEST_F(InstantServiceTest, DispatchGoogleURLUpdated) {
-  EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
-      .Times(1);
-
-  const std::string new_base_url = "https://www.google.es/";
-  NotifyGoogleBaseURLUpdate(new_base_url);
-}
-
-TEST_F(InstantServiceEnabledTest, SendsSearchURLsToRenderer) {
+TEST_F(InstantServiceTest, SendsSearchURLsToRenderer) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
+      "Group1 use_cacheable_ntp:1"));
   scoped_ptr<content::MockRenderProcessHost> rph(
       new content::MockRenderProcessHost(profile()));
   rph->sink().ClearMessages();
@@ -122,8 +102,10 @@
             GetInstantSearchPrerenderer());
 }
 
-TEST_F(InstantServiceEnabledTest,
+TEST_F(InstantServiceTest,
        ResetInstantSearchPrerenderer_DefaultProviderChanged) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
   EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
       .Times(2);
 
@@ -145,15 +127,18 @@
             GetInstantSearchPrerenderer());
 }
 
-TEST_F(InstantServiceEnabledTest,
-       ResetInstantSearchPrerenderer_GoogleBaseURLUpdated) {
+TEST_F(InstantServiceTest, ResetInstantSearchPrerenderer_GoogleBaseURLUpdated) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
   EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
       .Times(1);
+  EXPECT_CALL(*instant_service_observer_.get(), GoogleURLUpdated()).Times(1);
 
+  SetUserSelectedDefaultSearchProvider("https://google.com/");
   InstantSearchPrerenderer* old_prerenderer = GetInstantSearchPrerenderer();
-  EXPECT_TRUE(old_prerenderer != NULL);
+  EXPECT_NE(static_cast<InstantSearchPrerenderer*>(NULL), old_prerenderer);
 
-  const std::string new_base_url = "https://www.google.es/";
+  const std::string& new_base_url = "https://www.google.es/";
   NotifyGoogleBaseURLUpdate(new_base_url);
   EXPECT_NE(old_prerenderer, GetInstantSearchPrerenderer());
 }