Combined window positioning and show state determiniation in the WindowSizer

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/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 124 matching lines @@
   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 =
-      chrome::GetSavedWindowShowState(browser()) == ui::SHOW_STATE_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 {
@@ skipping 37 matching lines @@
   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 =
-      chrome::GetSavedWindowShowState(browser()) == ui::SHOW_STATE_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