Extract MonitorInfoProvider from WindowSizer.

chrome/browser/pdf_browsertest.cc

 // Copyright (c) 2011 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/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_observer.h"
 #include "net/test/test_server.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/screen.h"
 
 namespace {
 
 // Include things like browser frame and scrollbar and make sure we're bigger
 // than the test pdf document.
 static const int kBrowserWidth = 1000;
 static const int kBrowserHeight = 600;
 
 class PDFBrowserTest : public InProcessBrowserTest,
                        public content::NotificationObserver {
@@ skipping 21 matching lines @@
     return FilePath(FilePath::kCurrentDirectory).AppendASCII("..").
         AppendASCII("..").AppendASCII("..").AppendASCII("pdf").
         AppendASCII("test");
   }
 
   void Load() {
     // Make sure to set the window size before rendering, as otherwise rendering
     // to a smaller window and then expanding leads to slight anti-aliasing
     // differences of the text and the pixel comparison fails.
     gfx::Rect bounds(gfx::Rect(0, 0, kBrowserWidth, kBrowserHeight));
-    scoped_ptr<WindowSizer::MonitorInfoProvider> monitor_info(
-        WindowSizer::CreateDefaultMonitorInfoProvider());
-    gfx::Rect screen_bounds = monitor_info->GetPrimaryMonitorBounds();
+    gfx::Rect screen_bounds = gfx::Screen::GetPrimaryMonitorBounds();
     ASSERT_GT(screen_bounds.width(), kBrowserWidth);
     ASSERT_GT(screen_bounds.height(), kBrowserHeight);
     browser()->window()->SetBounds(bounds);
 
     GURL url(ui_test_utils::GetTestUrl(
         GetPDFTestDir(),
         FilePath(FILE_PATH_LITERAL("pdf_browsertest.pdf"))));
     ui_test_utils::NavigateToURL(browser(), url);
   }
 
@@ skipping 275 matching lines @@
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
       browser()->GetSelectedTabContents()->render_view_host(),
       std::wstring(),
       L"reloadPDF();"));
   observer.Wait();
 
   ASSERT_EQ("success", browser()->GetSelectedTabContents()->GetURL().query());
 }
 
 }  // namespace