Remove DisplayChangeObserver ash dependencies.

ui/display/manager/display_manager.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 "ui/display/manager/display_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
@@ skipping 111 matching lines @@
 }
 
 }  // namespace
 
 using std::string;
 using std::vector;
 
 // static
 int64_t DisplayManager::kUnifiedDisplayId = -10;
 
-DisplayManager::DisplayManager(std::unique_ptr<Screen> screen)
+DisplayManager::DisplayManager(
+    std::unique_ptr<Screen> screen,
+    std::unique_ptr<DisplayStringProvider> string_provider)
     : screen_(std::move(screen)),
+      string_provider_(std::move(string_provider)),
       layout_store_(new DisplayLayoutStore),
       weak_ptr_factory_(this) {
 #if defined(OS_CHROMEOS)
   change_display_upon_host_resize_ = !base::SysInfo::IsRunningOnChromeOS();
   unified_desktop_enabled_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       ::switches::kEnableUnifiedDesktop);
 #endif
 }
 
 DisplayManager::~DisplayManager() {
@@ skipping 431 matching lines @@
     else if (display_modes_.find(iter->id()) != display_modes_.end())
       display_modes_[iter->id()] = *display_modes_iter;
   }
   if (Display::HasInternalDisplay() && !internal_display_connected) {
     if (display_info_.find(Display::InternalDisplayId()) ==
         display_info_.end()) {
       // Create a dummy internal display if the chrome restarted
       // in docked mode.
       ManagedDisplayInfo internal_display_info(
           Display::InternalDisplayId(),
-          delegate_->GetInternalDisplayNameString(),
+          string_provider_->GetInternalDisplayNameString(),
           false /*Internal display must not have overscan */);
       internal_display_info.SetBounds(gfx::Rect(0, 0, 800, 600));
       display_info_[Display::InternalDisplayId()] = internal_display_info;
     } else {
       // Internal display is no longer active. Reset its rotation to user
       // preference, so that it is restored when the internal display becomes
       // active again.
       Display::Rotation user_rotation =
           display_info_[Display::InternalDisplayId()].GetRotation(
               Display::ROTATION_SOURCE_USER);
@@ skipping 297 matching lines @@
   auto iter = std::find_if(software_mirroring_display_list_.begin(),
                            software_mirroring_display_list_.end(),
                            [display_id](const Display& display) {
                              return display.id() == display_id;
                            });
   return iter == software_mirroring_display_list_.end() ? Display() : *iter;
 }
 
 std::string DisplayManager::GetDisplayNameForId(int64_t id) {
   if (id == kInvalidDisplayId)
-    return delegate_->GetInternalDisplayNameString();
+    return string_provider_->GetInternalDisplayNameString();
 
   std::map<int64_t, ManagedDisplayInfo>::const_iterator iter =
       display_info_.find(id);
   if (iter != display_info_.end() && !iter->second.name().empty())
     return iter->second.name();
 
   return base::StringPrintf("Display %d", static_cast<int>(id));
 }
 
 int64_t DisplayManager::GetDisplayIdForUIScaling() const {
@@ skipping 479 matching lines @@
 }
 
 const Display& DisplayManager::GetSecondaryDisplay() const {
   CHECK_LE(2U, GetNumDisplays());
   return GetDisplayAt(0).id() == Screen::GetScreen()->GetPrimaryDisplay().id()
              ? GetDisplayAt(1)
              : GetDisplayAt(0);
 }
 
 }  // namespace display