Migrate the rest of the "global" prefs.

chrome/browser/prefs/overlay_user_pref_store_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/values.h"
 #include "chrome/browser/prefs/overlay_user_pref_store.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_store_observer_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Mock;
 using ::testing::StrEq;
 
 namespace {
 
 const char* overlay_key = prefs::kBrowserWindowPlacement;
 const char* regular_key = prefs::kShowBookmarkBar;
-const char* mapped_overlay_key = prefs::kWebKitJavascriptEnabled;
-const char* mapped_underlay_key = prefs::kWebKitGlobalJavascriptEnabled;
+const char* mapped_overlay_key = "test.overlay.key";
+const char* mapped_underlay_key = "test.underlay.key";

[falken, 2012/05/21 11:05:46]

Renaming since eventually we want to remove kWebKitGlobalJavascriptEnabled

[Peter Kasting, 2012/05/21 21:37:20]

Nit: Maybe add comments about this?  Maybe pick more descriptive names, like the
original names + ".temp" or something?

[falken, 2012/05/22 02:24:21]

Done.

 
 }  // namespace
 
 class OverlayUserPrefStoreTest : public testing::Test {
  protected:
   OverlayUserPrefStoreTest()
       : underlay_(new TestingPrefStore()),
         overlay_(new OverlayUserPrefStore(underlay_.get())) {
     overlay_->RegisterOverlayPref(overlay_key);
     overlay_->RegisterOverlayPref(mapped_overlay_key, mapped_underlay_key);
@@ skipping 239 matching lines @@
 
   overlay_->RemoveObserver(&obs);
 
   // Check successful unsubscription.
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0);
   EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0);
   underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(47));
   overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(48));
   Mock::VerifyAndClearExpectations(&obs);
 }