Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

extensions/browser/api/system_info/system_info_api.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 "extensions/browser/api/system_info/system_info_api.h"
 
 #include <stdint.h>
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "components/storage_monitor/removable_storage_observer.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/api/system_display/display_info_provider.h"

[oshima, 2016/01/20 06:40:12]

remove this?

[scottmg, 2016/01/26 20:46:35]

Done.

 #include "extensions/browser/api/system_storage/storage_info_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/api/system_display.h"
 #include "extensions/common/api/system_storage.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/screen.h"
 
 namespace extensions {
 
 using api::system_storage::StorageUnitInfo;
@@ skipping 79 matching lines @@
 }
 
 void SystemInfoEventRouter::AddEventListener(const std::string& event_name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   watching_event_set_.insert(event_name);
   if (watching_event_set_.count(event_name) > 1)
     return;
 
   if (IsDisplayChangedEvent(event_name)) {
-    gfx::Screen* screen = DisplayInfoProvider::Get()->GetActiveScreen();
+    gfx::Screen* screen = gfx::Screen::GetScreen();
     if (screen)
       screen->AddObserver(this);
   }
 
   if (IsSystemStorageEvent(event_name)) {
     if (!has_storage_monitor_observer_) {
       has_storage_monitor_observer_ = true;
       DCHECK(StorageMonitor::GetInstance()->IsInitialized());
       StorageMonitor::GetInstance()->AddObserver(this);
     }
   }
 }
 
 void SystemInfoEventRouter::RemoveEventListener(const std::string& event_name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   std::multiset<std::string>::iterator it =
       watching_event_set_.find(event_name);
   if (it != watching_event_set_.end()) {
     watching_event_set_.erase(it);
     if (watching_event_set_.count(event_name) > 0)
       return;
   }
 
   if (IsDisplayChangedEvent(event_name)) {
-    gfx::Screen* screen = DisplayInfoProvider::Get()->GetActiveScreen();
+    gfx::Screen* screen = gfx::Screen::GetScreen();
     if (screen)
       screen->RemoveObserver(this);
   }
 
   if (IsSystemStorageEvent(event_name)) {
     const std::string& other_event_name =
         (event_name == system_storage::OnDetached::kEventName)
             ? system_storage::OnAttached::kEventName
             : system_storage::OnDetached::kEventName;
     if (watching_event_set_.count(other_event_name) == 0) {
@@ skipping 98 matching lines @@
 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
   if (IsSystemStorageEvent(details.event_name)) {
     StorageMonitor::GetInstance()->EnsureInitialized(
         base::Bind(&RemoveEventListener, details.event_name));
   } else {
     RemoveEventListener(details.event_name);
   }
 }
 
 }  // namespace extensions