Renamed OutputConfigurator to DisplayConfigurator

chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

Index: chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
diff --git a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
index ce336e8f7078d2bdde8633bc6e502e5ef2f4d16b..80a07ae773147455eda5a2f9e61c6d9572831025 100644
--- a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
@@ -21,7 +21,7 @@
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ui/aura/window.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 #include "ui/gfx/screen.h"
 #endif
 
@@ -96,13 +96,13 @@ class PepperOutputProtectionMessageFilter::Delegate
   int32_t OnEnableProtection(uint32_t desired_method_mask);
 
  private:
-  ui::OutputConfigurator::OutputProtectionClientId GetClientId();
+  ui::DisplayConfigurator::OutputProtectionClientId GetClientId();
 
   // Used to lookup the WebContents associated with this PP_Instance.
   int render_process_id_;
   int render_frame_id_;
 
-  ui::OutputConfigurator::OutputProtectionClientId client_id_;
+  ui::DisplayConfigurator::OutputProtectionClientId client_id_;
   // The display id which the renderer currently uses.
   int64 display_id_;
   // The last desired method mask. Will enable this mask on new display if
@@ -114,7 +114,7 @@ PepperOutputProtectionMessageFilter::Delegate::Delegate(int render_process_id,
                                                         int render_frame_id)
     : render_process_id_(render_process_id),
       render_frame_id_(render_frame_id),
-      client_id_(ui::OutputConfigurator::kInvalidClientId),
+      client_id_(ui::DisplayConfigurator::kInvalidClientId),
       display_id_(0) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
@@ -123,8 +123,8 @@ PepperOutputProtectionMessageFilter::Delegate::Delegate(int render_process_id,
 PepperOutputProtectionMessageFilter::Delegate::~Delegate() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  ui::OutputConfigurator* configurator =
-      ash::Shell::GetInstance()->output_configurator();
+  ui::DisplayConfigurator* configurator =
+      ash::Shell::GetInstance()->display_configurator();
   configurator->UnregisterOutputProtectionClient(client_id_);
 
   content::RenderFrameHost* rfh =
@@ -136,21 +136,21 @@ PepperOutputProtectionMessageFilter::Delegate::~Delegate() {
   }
 }
 
-ui::OutputConfigurator::OutputProtectionClientId
+ui::DisplayConfigurator::OutputProtectionClientId
 PepperOutputProtectionMessageFilter::Delegate::GetClientId() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  if (client_id_ == ui::OutputConfigurator::kInvalidClientId) {
+  if (client_id_ == ui::DisplayConfigurator::kInvalidClientId) {
     content::RenderFrameHost* rfh =
         content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
     if (!GetCurrentDisplayId(rfh, &display_id_))
-      return ui::OutputConfigurator::kInvalidClientId;
+      return ui::DisplayConfigurator::kInvalidClientId;
     gfx::NativeView native_view = rfh->GetNativeView();
     if (!native_view)
-      return ui::OutputConfigurator::kInvalidClientId;
+      return ui::DisplayConfigurator::kInvalidClientId;
     native_view->AddObserver(this);
 
-    ui::OutputConfigurator* configurator =
-        ash::Shell::GetInstance()->output_configurator();
+    ui::DisplayConfigurator* configurator =
+        ash::Shell::GetInstance()->display_configurator();
     client_id_ = configurator->RegisterOutputProtectionClient();
   }
   return client_id_;
@@ -167,8 +167,8 @@ int32_t PepperOutputProtectionMessageFilter::Delegate::OnQueryStatus(
     return PP_ERROR_FAILED;
   }
 
-  ui::OutputConfigurator* configurator =
-      ash::Shell::GetInstance()->output_configurator();
+  ui::DisplayConfigurator* configurator =
+      ash::Shell::GetInstance()->display_configurator();
   bool result = configurator->QueryOutputProtectionStatus(
       GetClientId(), display_id_, link_mask, protection_mask);
 
@@ -192,8 +192,8 @@ int32_t PepperOutputProtectionMessageFilter::Delegate::OnEnableProtection(
     uint32_t desired_method_mask) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  ui::OutputConfigurator* configurator =
-      ash::Shell::GetInstance()->output_configurator();
+  ui::DisplayConfigurator* configurator =
+      ash::Shell::GetInstance()->display_configurator();
   bool result = configurator->EnableOutputProtection(
       GetClientId(), display_id_, desired_method_mask);
   desired_method_mask_ = desired_method_mask;
@@ -217,8 +217,8 @@ void PepperOutputProtectionMessageFilter::Delegate::OnWindowHierarchyChanged(
 
   if (desired_method_mask_ != ui::OUTPUT_PROTECTION_METHOD_NONE) {
     // Display changed and should enable output protections on new display.
-    ui::OutputConfigurator* configurator =
-        ash::Shell::GetInstance()->output_configurator();
+    ui::DisplayConfigurator* configurator =
+        ash::Shell::GetInstance()->display_configurator();
     configurator->EnableOutputProtection(GetClientId(), new_display_id,
                                          desired_method_mask_);
     configurator->EnableOutputProtection(