Clean up pref change notification handling.

chrome/browser/extensions/extension_management_browsertest.cc

 // Copyright (c) 2009 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/ref_counted.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/extension_updater.h"
-#include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/scoped_pref_update.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
 
 class ExtensionManagementTest : public ExtensionBrowserTest {
  protected:
   // Helper method that returns whether the extension is at the given version.
@@ skipping 305 matching lines @@
   URLFetcher::enable_interception_for_tests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
                                      basedir.AppendASCII("manifest_v2.xml"));
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v2.crx",
                                      basedir.AppendASCII("v2.crx"));
 
   const size_t size_before = service->extensions()->size();
   ASSERT_TRUE(service->disabled_extensions()->empty());
 
-  // Set the policy as a user preference and fire notification observers.
   PrefService* prefs = browser()->profile()->GetPrefs();
-  ListValue* forcelist =
-      prefs->GetMutableList(prefs::kExtensionInstallForceList);
-  ASSERT_TRUE(forcelist->empty());
-  forcelist->Append(Value::CreateStringValue(
-      "ogjcoiohnmldgjemafoockdghcjciccf;"
-      "http://localhost/autoupdate/manifest"));
-  prefs->pref_notifier()->FireObservers(prefs::kExtensionInstallForceList);
+  {
+    // Set the policy as a user preference and fire notification observers.
+    ScopedPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
+    ListValue* forcelist =
+        prefs->GetMutableList(prefs::kExtensionInstallForceList);
+    ASSERT_TRUE(forcelist->empty());
+    forcelist->Append(Value::CreateStringValue(
+        "ogjcoiohnmldgjemafoockdghcjciccf;"
+        "http://localhost/autoupdate/manifest"));
+  }
 
   // Check if the extension got installed.
   ASSERT_TRUE(WaitForExtensionInstall());
   const ExtensionList* extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   ASSERT_EQ(kExtensionId, extensions->at(size_before)->id());
   EXPECT_EQ("2.0", extensions->at(size_before)->VersionString());
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD,
             extensions->at(size_before)->location());
 
   // Check that emptying the list doesn't cause any trouble.
   prefs->ClearPref(prefs::kExtensionInstallForceList);
-  prefs->pref_notifier()->FireObservers(prefs::kExtensionInstallForceList);
 }