Test fixes and clean up in preparation for moving DSE to Prefs.

chrome/browser/search_engines/search_provider_install_data_unittest.cc

Index: chrome/browser/search_engines/search_provider_install_data_unittest.cc
diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
index ebc6616dfe43072194dff0566ca1a36a1023a71d..a55425580be38960b97d2a4407ea9631e90c1299 100644
--- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc
+++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
@@ -125,8 +125,6 @@ class SearchProviderInstallDataTest : public testing::Test {
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
-  void SimulateDefaultSearchIsManaged(const std::string& url);
-
  protected:
   TemplateURL* AddNewTemplateURL(const std::string& url,
                                  const base::string16& keyword);
@@ -172,29 +170,6 @@ void SearchProviderInstallDataTest::TearDown() {
   testing::Test::TearDown();
 }
 
-void SearchProviderInstallDataTest::SimulateDefaultSearchIsManaged(
-    const std::string& url) {
-  ASSERT_FALSE(url.empty());
-  TestingPrefServiceSyncable* service =
-      util_.profile()->GetTestingPrefService();
-  service->SetManagedPref(prefs::kDefaultSearchProviderEnabled,
-                          base::Value::CreateBooleanValue(true));
-  service->SetManagedPref(prefs::kDefaultSearchProviderSearchURL,
-                          base::Value::CreateStringValue(url));
-  service->SetManagedPref(prefs::kDefaultSearchProviderName,
-                          base::Value::CreateStringValue("managed"));
-  service->SetManagedPref(prefs::kDefaultSearchProviderKeyword,
-                          new base::StringValue("managed"));
-  // Clear the IDs that are not specified via policy.
-  service->SetManagedPref(prefs::kDefaultSearchProviderID,
-                          new base::StringValue(std::string()));
-  service->SetManagedPref(prefs::kDefaultSearchProviderPrepopulateID,
-                          new base::StringValue(std::string()));
-  util_.model()->Observe(chrome::NOTIFICATION_DEFAULT_SEARCH_POLICY_CHANGED,
-                         content::NotificationService::AllSources(),
-                         content::NotificationService::NoDetails());
-}
-
 TemplateURL* SearchProviderInstallDataTest::AddNewTemplateURL(
     const std::string& url,
     const base::string16& keyword) {
@@ -239,8 +214,17 @@ TEST_F(SearchProviderInstallDataTest, ManagedDefaultSearch) {
 
   // Set a managed preference that establishes a default search provider.
   std::string host2 = "www.managedtest.com";
-  std::string url2 = "http://" + host2 + "/p{searchTerms}";
-  SimulateDefaultSearchIsManaged(url2);
+  util_.SetManagedDefaultSearchPreferences(
+      true,
+      "managed",
+      "managed",
+      "http://" + host2 + "/p{searchTerms}",
+      std::string(),
+      std::string(),
+      std::string(),
+      std::string(),
+      std::string());
+
   EXPECT_TRUE(util_.model()->is_default_search_managed());
 
   // Wait for the changes to be saved.