Revamp the MigrateBrowserPrefs and MigrateUserPrefs code.

chrome/browser/prefs/pref_service_browsertest.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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 34 matching lines @@
     return;
 #endif
 
   gfx::Rect bounds = browser()->window()->GetBounds();
   gfx::Rect expected_bounds(gfx::Rect(20, 30, 400, 500));
   ASSERT_EQ(expected_bounds.ToString(), bounds.ToString());
 }
 
 class PreferenceServiceTest : public InProcessBrowserTest {
  public:
   explicit PreferenceServiceTest(bool new_profile) : new_profile_(new_profile) {

[gab, 2015/03/02 17:21:18]

Remove bool param (and member) here (now never used in false mode) and simplify
the rest of this test fixture accordingly.

[rkaplow, 2015/03/02 19:23:26]

Done. Sorry I'm being a bit myopic with changes!

   }
 
   bool SetUpUserDataDirectory() override {
     base::FilePath user_data_directory;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
 
     if (new_profile_) {
       original_pref_file_ = ui_test_utils::GetTestFilePath(
           base::FilePath().AppendASCII("profiles").
                      AppendASCII("window_placement").
@@ skipping 91 matching lines @@
   EXPECT_EQ(right, bounds.x() + bounds.width());
 
   // Find if launched window is maximized.
   bool is_window_maximized = browser()->window()->IsMaximized();
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif
-
-#if defined(OS_WIN) || defined(OS_MACOSX)
-
-class PreservedWindowPlacementIsMigrated : public PreferenceServiceTest {
- public:
-  PreservedWindowPlacementIsMigrated() : PreferenceServiceTest(false) {
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsMigrated, Test) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAshBrowserTests))
-    return;
-#endif
-
-  // The window should open with the old reference profile, with window
-  // placement values stored in Local State.
-
-  JSONFileValueSerializer deserializer(original_pref_file_);
-  scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));
-
-  ASSERT_TRUE(root.get());
-  ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
-
-  // Retrieve the screen rect for the launched window
-  gfx::Rect bounds = browser()->window()->GetRestoredBounds();
-
-  // Values from old reference profile in Local State should have been
-  // correctly migrated to the user's Preferences -- if so, the window
-  // should be set to values taken from the user's Local State.
-  base::DictionaryValue* root_dict =
-      static_cast<base::DictionaryValue*>(root.get());
-
-  // Retrieve the expected rect values from User Preferences, where they
-  // should have been migrated from Local State.
-  int bottom = 0;
-  std::string kBrowserWindowPlacement(prefs::kBrowserWindowPlacement);
-  EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".bottom",
-      &bottom));
-  EXPECT_EQ(bottom, bounds.y() + bounds.height());
-
-  int top = 0;
-  EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".top",
-      &top));
-  EXPECT_EQ(top, bounds.y());
-
-  int left = 0;
-  EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".left",
-      &left));
-  EXPECT_EQ(left, bounds.x());
-
-  int right = 0;
-  EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".right",
-      &right));
-  EXPECT_EQ(right, bounds.x() + bounds.width());
-
-  // Find if launched window is maximized.
-  bool is_window_maximized = browser()->window()->IsMaximized();
-  bool is_maximized = false;
-  EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
-      &is_maximized));
-  EXPECT_EQ(is_maximized, is_window_maximized);
-}
-#endif