Clean up pref change notification handling.

chrome/browser/extensions/extensions_service_unittest.cc

 // Copyright (c) 2010 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 "chrome/browser/extensions/extensions_service_unittest.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/external_extension_provider.h"
 #include "chrome/browser/extensions/external_pref_extension_provider.h"
 #include "chrome/browser/extensions/pack_extension_job.cc"
 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_value_store.h"
+#include "chrome/browser/prefs/scoped_pref_update.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
@@ skipping 2277 matching lines @@
   EXPECT_NE(std::string(good1), loaded_[0]->id());
   EXPECT_NE(std::string(good1), loaded_[1]->id());
 }
 #endif
 
 // Will not install extension blacklisted by policy.
 TEST_F(ExtensionsServiceTest, BlacklistedByPolicyWillNotInstall) {
   InitializeEmptyExtensionsService();
 
   ListValue* whitelist =
-      profile_->GetPrefs()->GetMutableList("extensions.install.allowlist");
+      profile_->GetPrefs()->GetMutableList(prefs::kExtensionInstallAllowList);
   ListValue* blacklist =
-      profile_->GetPrefs()->GetMutableList("extensions.install.denylist");
+      profile_->GetPrefs()->GetMutableList(prefs::kExtensionInstallDenyList);
   ASSERT_TRUE(whitelist != NULL && blacklist != NULL);
 
   // Blacklist everything.
   blacklist->Append(Value::CreateStringValue("*"));
 
   // Blacklist prevents us from installing good_crx.
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
   FilePath path = extensions_path.AppendASCII("good.crx");
@@ skipping 16 matching lines @@
 
   // Install good_crx.
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
   FilePath path = extensions_path.AppendASCII("good.crx");
   service_->InstallExtension(path);
   loop_.RunAllPending();
   EXPECT_EQ(1u, service_->extensions()->size());
 
-  PrefService* prefs = profile_->GetPrefs();
-  ListValue* blacklist =
-      prefs->GetMutableList("extensions.install.denylist");
-  ASSERT_TRUE(blacklist != NULL);
+  { // Scope for pref update notification.
+    PrefService* prefs = profile_->GetPrefs();
+    ScopedPrefUpdate pref_update(prefs, prefs::kExtensionInstallDenyList);
+    ListValue* blacklist =
+        prefs->GetMutableList(prefs::kExtensionInstallDenyList);
+    ASSERT_TRUE(blacklist != NULL);
 
-  // Blacklist this extension.
-  blacklist->Append(Value::CreateStringValue(good_crx));
-  prefs->ScheduleSavePersistentPrefs();
-
-  // Programmatically appending to the prefs doesn't seem to notify the
-  // observers... :/
-  prefs->pref_notifier()->FireObservers("extensions.install.denylist");
+    // Blacklist this extension.
+    blacklist->Append(Value::CreateStringValue(good_crx));
+    prefs->ScheduleSavePersistentPrefs();
+  }
 
   // Extension should not be running now.
   loop_.RunAllPending();
   EXPECT_EQ(0u, service_->extensions()->size());
 }
 
 // Tests disabling extensions
 TEST_F(ExtensionsServiceTest, DisableExtension) {
   InitializeEmptyExtensionsService();
   FilePath extensions_path;
@@ skipping 745 matching lines @@
   // Component extensions shouldn't get recourded in the prefs.
   ValidatePrefKeyCount(0);
 
   // Reload all extensions, and make sure it comes back.
   std::string extension_id = service_->extensions()->at(0)->id();
   loaded_.clear();
   service_->ReloadExtensions();
   ASSERT_EQ(1u, service_->extensions()->size());
   EXPECT_EQ(extension_id, service_->extensions()->at(0)->id());
 }