If default search is managed, we should not asked the user to choose it at First Run. Make sure the minimum bubble is not showed if there is no default search.

This is a re-issue of CL 3565013 without the extraneous change to search_engine_list_model.mm, to be done in a forthcoming CL>

BUG=49306

TEST=Set a managed default search provider.  Clear your Chromium user data directory (~/Library/Chromium, ~/.config/chromium, %localappdata%\Chromium) and the "First Run" file found next to the executable.  Start Chrome.  It should not ask you to choose a default search provider.  Disable the default search provider via policy.  Make sure the minimal bubble is not shown. Redo these tests for the GOOGLE_CHROME_BUILD to make sure that we still ask about usage stats.

Review URL: http://codereview.chromium.org/3847006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63024 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 20 deletions

diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index 4d0d33c..e7bcb92 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -803,10 +803,8 @@ bool TemplateURLModel::LoadDefaultSearchProviderFromPrefs(
   if (!prefs || !prefs->HasPrefPath(prefs::kDefaultSearchProviderSearchURL))
     return false;
 
-  // By default, kDefaultSearchProviderEnabled is true.  Users of previous
-  // versions will transition correctly.
   const PrefService::Preference* pref =
-      prefs->FindPreference(prefs::kDefaultSearchProviderEnabled);
+      prefs->FindPreference(prefs::kDefaultSearchProviderSearchURL);
   *is_managed = pref && pref->IsManaged();
 
   bool enabled =
diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc
index 7f4dc72..15c4b12 100644
--- a/chrome/browser/search_engines/template_url_model_unittest.cc
+++ b/chrome/browser/search_engines/template_url_model_unittest.cc
@@ -186,7 +186,8 @@ class TemplateURLModelTest : public testing::Test {
 
   // 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 @@ class TemplateURLModelTest : public testing::Test {
     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 @@ class TemplateURLModelTest : public testing::Test {
     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 @@ TEST_F(TemplateURLModelTest, TestManagedDefaultSearch) {
   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 @@ TEST_F(TemplateURLModelTest, TestManagedDefaultSearch) {
   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 @@ TEST_F(TemplateURLModelTest, TestManagedDefaultSearch) {
   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());