Make DisplayInfoProvider an interface

chrome/browser/extensions/api/system_display/system_display_apitest.cc

 // Copyright 2013 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 "chrome/browser/extensions/api/system_display/system_display_api.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
+#include "chrome/common/extensions/api/system_display.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/screen_ash.h"
 #include "ash/shell.h"
 #endif
 
 namespace utils = extension_function_test_utils;
@@ skipping 22 matching lines @@
   // Overridden from gfx::Screen:
   virtual int GetNumDisplays() const OVERRIDE {
     return displays_.size();
   }
   virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
     return displays_;
   }
   virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
     return displays_[0];
   }
+
  private:
   std::vector<gfx::Display> displays_;
 
   DISALLOW_COPY_AND_ASSIGN(MockScreen);
 };
 #else
 class MockScreen : public Screen {
  public:
   MockScreen() {
     for (int i = 0; i < 4; i++) {
@@ skipping 123 matching lines @@
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
                                    ash::Shell::GetScreen());
 #endif
     ExtensionApiTest::TearDownOnMainThread();
   }
 
  protected:
   scoped_ptr<MockDisplayInfoProvider> provider_;
   scoped_ptr<gfx::Screen> screen_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(SystemDisplayApiTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, GetDisplay) {
   ASSERT_TRUE(RunPlatformAppTest("system/display")) << message_;
 }
 
 #if !defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplay) {
   scoped_refptr<SystemDisplaySetDisplayPropertiesFunction>
@@ skipping 87 matching lines @@
   ASSERT_TRUE(set_info->GetDictionary("overscan", &overscan));
   EXPECT_EQ(1, utils::GetInteger(overscan, "left"));
   EXPECT_EQ(2, utils::GetInteger(overscan, "top"));
   EXPECT_EQ(3, utils::GetInteger(overscan, "right"));
   EXPECT_EQ(4, utils::GetInteger(overscan, "bottom"));
 
   EXPECT_EQ("display_id", provider_->GetSetInfoDisplayId());
 }
 #endif  // defined(OS_CHROMEOS)
 
-} // namespace extensions
+}  // namespace extensions