Make DisplayInfoProvider an interface

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

Index: chrome/browser/extensions/api/system_display/display_info_provider.cc
diff --git a/chrome/browser/extensions/api/system_display/display_info_provider.cc b/chrome/browser/extensions/api/system_display/display_info_provider.cc
index d57bd15ce0a477cb723337ed4af2b47f92c87ccf..1505e51e1a8927f6877204375fb50ba508abd919 100644
--- a/chrome/browser/extensions/api/system_display/display_info_provider.cc
+++ b/chrome/browser/extensions/api/system_display/display_info_provider.cc
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

[James Cook, 2014/08/15 19:58:42]

Shouldn't this include display_info_provider.h?

-#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
-
 #include "base/strings/string_number_conversions.h"
+#include "chrome/browser/extensions/display_info_provider_impl.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
@@ -50,8 +49,6 @@ CreateDisplayUnitInfo(const gfx::Display& display, int64 primary_display_id) {
   return unit;
 }
 
-DisplayInfoProvider* g_display_info_provider = NULL;
-
 }  // namespace
 
 
@@ -59,18 +56,6 @@ DisplayInfoProvider::DisplayInfoProvider() {}
 
 DisplayInfoProvider::~DisplayInfoProvider() {}
 
-DisplayInfoProvider* DisplayInfoProvider::Get() {
-  if (g_display_info_provider == NULL)
-    g_display_info_provider = new DisplayInfoProvider();
-  return g_display_info_provider;
-}
-
-void DisplayInfoProvider::InitializeForTesting(
-    DisplayInfoProvider* display_info_provider) {
-  DCHECK(display_info_provider);
-  g_display_info_provider = display_info_provider;
-}
-
 DisplayInfo DisplayInfoProvider::GetAllDisplaysInfo() {
   // TODO(scottmg): Native is wrong http://crbug.com/133312
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();