more changes

chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

 // Copyright (c) 2011 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 "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.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 54 matching lines @@
   void ClearChangeCount() {
     model_changed_count_ = items_changed_count_ = added_count_ =
         removed_count_ = 0;
   }
 
   void SimulateDefaultSearchIsManaged(const std::string& url) {
     ASSERT_FALSE(url.empty());
     TestingPrefService* service = profile_->GetTestingPrefService();
     service->SetManagedPref(
         prefs::kDefaultSearchProviderEnabled,
-        Value::CreateBooleanValue(true));
+        base::TrueValue());
     service->SetManagedPref(
         prefs::kDefaultSearchProviderSearchURL,
-        Value::CreateStringValue(url));
+        base::StringValue::New(url));
     service->SetManagedPref(
         prefs::kDefaultSearchProviderName,
-        Value::CreateStringValue("managed"));
+        base::StringValue::New("managed"));
     // Clear the IDs that are not specified via policy.
     service->SetManagedPref(
-        prefs::kDefaultSearchProviderID, new StringValue(""));
+        prefs::kDefaultSearchProviderID, base::StringValue::New(""));
     service->SetManagedPref(
-        prefs::kDefaultSearchProviderPrepopulateID, new StringValue(""));
+        prefs::kDefaultSearchProviderPrepopulateID, base::StringValue::New(""));
     model_->Observe(
         chrome::NOTIFICATION_PREF_CHANGED,
         Source<PrefService>(profile_->GetTestingPrefService()),
         Details<std::string>(NULL));
   }
 
   TemplateURLTableModel* table_model() const {
     return controller_->table_model();
   }
 
@@ skipping 155 matching lines @@
   turl->set_short_name(ASCIIToUTF16("b"));
   model_->Add(turl);
 
   // Table model should have updated.
   VerifyChangeCount(1, 0, 0, 0);
 
   // And should contain the newly added TemplateURL.
   ASSERT_EQ(1, table_model()->RowCount());
   ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl));
 }