Make ExtensionPrefValueMap a ProfileKeyedService.

chrome/browser/protector/protected_prefs_watcher_unittest.cc

 // Copyright (c) 2012 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/message_loop.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/extension_pref_value_map.h"
+#include "chrome/browser/extensions/extension_pref_value_map_factory.h"
 #include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
@@ skipping 79 matching lines @@
 
 TEST_F(ProtectedPrefsWatcherTest, ExtensionPrefChange) {
   // Changes to extensions data (but not to extension IDs) do not update
   // the backup and its signature.
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
 
   FilePath extensions_install_dir =
       profile_.GetPath().AppendASCII(ExtensionService::kInstallDirectoryName);
-  scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_(
-      new ExtensionPrefValueMap);
   scoped_ptr<ExtensionPrefs> extension_prefs(
       new ExtensionPrefs(profile_.GetPrefs(),
                          extensions_install_dir,
-                         extension_pref_value_map_.get()));
+                         ExtensionPrefValueMapFactory::GetForProfile(
+                             &profile_)));
   std::string sample_id = extension_misc::kWebStoreAppId;
   extension_prefs->Init(false);
   // Flip a pref value of an extension (this will actually add it to the list).
   extension_prefs->SetAppNotificationDisabled(
       sample_id, !extension_prefs->IsAppNotificationDisabled(sample_id));
 
   // Backup is still valid.
   EXPECT_TRUE(prefs_watcher_->is_backup_valid());
 
   // Make signature invalid by changing it directly.
@@ skipping 59 matching lines @@
   // Now the backup should be valid and "pinned_tabs" is added back.
   EXPECT_TRUE(prefs_watcher_->is_backup_valid());
   EXPECT_TRUE(pinned_tabs_copy->Equals(prefs_->GetList("backup.pinned_tabs")));
   EXPECT_TRUE(pinned_tabs_copy->Equals(prefs_->GetList(prefs::kPinnedTabs)));
   EXPECT_FALSE(prefs_watcher_->DidPrefChange(prefs::kPinnedTabs));
   EXPECT_EQ(ProtectedPrefsWatcher::kCurrentVersionNumber,
             prefs_->GetInteger("backup._version"));
 }
 
 }  // namespace protector