If default search is managed, we should not asked the user to choose it at Fi...

chrome/browser/search_engines/template_url_model_unittest.cc

Index: chrome/browser/search_engines/template_url_model_unittest.cc
===================================================================
--- chrome/browser/search_engines/template_url_model_unittest.cc	(revision 63018)
+++ chrome/browser/search_engines/template_url_model_unittest.cc	(working copy)
@@ -186,7 +186,8 @@
 
   // Set the managed preferences for the default search provider and trigger
   // notification.
-  void SetManagedDefaultSearchPreferences(const char* name,
+  void SetManagedDefaultSearchPreferences(bool enabled,
+                                          const char* name,
                                           const char* search_url,
                                           const char* suggest_url,
                                           const char* icon_url,
@@ -195,7 +196,7 @@
     TestingPrefService* service = profile()->GetTestingPrefService();
     service->SetManagedPrefWithoutNotification(
         prefs::kDefaultSearchProviderEnabled,
-        Value::CreateBooleanValue(true));
+        Value::CreateBooleanValue(enabled));
     service->SetManagedPrefWithoutNotification(
         prefs::kDefaultSearchProviderName,
         Value::CreateStringValue(name));
@@ -222,16 +223,6 @@
     NotifyManagedPrefsHaveChanged();
   }
 
-  // Set the managed preferences for the default search provider and trigger
-  // notification.
-  void DisableManagedDefaultSearchProvider() {
-    TestingPrefService* service = profile()->GetTestingPrefService();
-    service->SetManagedPrefWithoutNotification(
-        prefs::kDefaultSearchProviderEnabled,
-        Value::CreateBooleanValue(false));
-    NotifyManagedPrefsHaveChanged();
-  }
-
   // Remove all the managed preferences for the default search provider and
   // trigger notification.
   void RemoveManagedDefaultSearchPreferences() {
@@ -1120,7 +1111,7 @@
   const char kSearchURL[] = "http://test.com/search?t={searchTerms}";
   const char kIconURL[] = "http://test.com/icon.jpg";
   const char kEncodings[] = "UTF-16;UTF-32";
-  SetManagedDefaultSearchPreferences(kName, kSearchURL, "", kIconURL,
+  SetManagedDefaultSearchPreferences(true, kName, kSearchURL, "", kIconURL,
                                      kEncodings, "");
   VerifyObserverCount(1);
   EXPECT_TRUE(model()->is_default_search_managed());
@@ -1144,8 +1135,8 @@
   const char kNewName[] = "test2";
   const char kNewSearchURL[] = "http://other.com/search?t={searchTerms}";
   const char kNewSuggestURL[] = "http://other.com/suggest?t={searchTerms}";
-  SetManagedDefaultSearchPreferences(kNewName, kNewSearchURL, kNewSuggestURL,
-                                     "", "", "");
+  SetManagedDefaultSearchPreferences(true, kNewName, kNewSearchURL,
+                                     kNewSuggestURL, "", "", "");
   VerifyObserverCount(1);
   EXPECT_TRUE(model()->is_default_search_managed());
   EXPECT_EQ(2 + initial_count, model()->GetTemplateURLs().size());
@@ -1174,14 +1165,14 @@
   EXPECT_EQ(actual_final_managed_default->show_in_default_list(), true);
 
   // Disable the default search provider through policy.
-  DisableManagedDefaultSearchProvider();
+  SetManagedDefaultSearchPreferences(false, "", "", "", "", "", "");
   VerifyObserverCount(1);
   EXPECT_TRUE(model()->is_default_search_managed());
   EXPECT_TRUE(NULL == model()->GetDefaultSearchProvider());
   EXPECT_EQ(1 + initial_count, model()->GetTemplateURLs().size());
 
   // Re-enable it.
-  SetManagedDefaultSearchPreferences(kName, kSearchURL, "", kIconURL,
+  SetManagedDefaultSearchPreferences(true, kName, kSearchURL, "", kIconURL,
                                      kEncodings, "");
   VerifyObserverCount(1);
   EXPECT_TRUE(model()->is_default_search_managed());