Move DisplayPowerServiceProvider to chromeos/dbus/services

Move DisplayPowerServiceProvider to chromeos/dbus/services

Introduce DisplayPowerServiceProvider::Delegate to get rid of dependencies to ash/ and ui/.

BUG=429354
Committed: https://crrev.com/c73d4a8360141fc2a8a0674a7210c5375cfca457
Cr-Commit-Position: refs/heads/master@{#304984}

[hashimoto, 2014-11-19 08:58:21]

hashimoto@chromium.org changed reviewers:
+ derat@chromium.org

[Daniel Erat, 2014-11-19 15:02:55]

lgtm. this is probably another case where we should probably have a
non-chrome-specific delegate, or even pass the UserActivityDetector and
DisplayConfigurator directly into the service provider.

[hashimoto, 2014-11-20 03:15:36]

The CQ bit was checked by hashimoto@chromium.org

[commit-bot: I haz the power, 2014-11-20 03:17:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/739123002/1

[commit-bot: I haz the power, 2014-11-20 04:05:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-20 04:05:06]

Failed to apply patch for
chrome/browser/chromeos/chrome_browser_main_chromeos.cc:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/browser/chromeos/chrome_browser_main_chromeos.cc:30
  Falling back to three-way merge...
  Applied patch to 'chrome/browser/chromeos/chrome_browser_main_chromeos.cc'
with conflicts.
  U chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Patch:       chrome/browser/chromeos/chrome_browser_main_chromeos.cc
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index
96d3d41147709db79ba07115ffa620e0daa98ab6..1a91571ddeb849782c6139c9bcf3590aca6f46bf
100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -30,7 +30,7 @@
 #include
"chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include
"chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h"
-#include "chrome/browser/chromeos/dbus/display_power_service_provider.h"
+#include
"chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"
 #include "chrome/browser/chromeos/dbus/printer_service_provider.h"
 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
@@ -98,6 +98,7 @@
 #include "chromeos/dbus/power_policy_controller.h"
 #include "chromeos/dbus/services/console_service_provider.h"
 #include "chromeos/dbus/services/cros_dbus_service.h"
+#include "chromeos/dbus/services/display_power_service_provider.h"
 #include "chromeos/dbus/services/liveness_service_provider.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
@@ -177,7 +178,8 @@ class DBusServices {
     service_providers.push_back(ProxyResolutionServiceProvider::Create());
 #if !defined(USE_ATHENA)
     // crbug.com/413897
-    service_providers.push_back(new DisplayPowerServiceProvider);
+    service_providers.push_back(new DisplayPowerServiceProvider(
+        make_scoped_ptr(new ChromeDisplayPowerServiceProviderDelegate)));
     // crbug.com/401285
     service_providers.push_back(new PrinterServiceProvider);
 #endif

[commit-bot: I haz the power, 2014-11-20 04:05:53]

The CQ bit was unchecked by commit-bot@chromium.org

[hashimoto, 2014-11-20 04:49:42]

The CQ bit was checked by hashimoto@chromium.org

[commit-bot: I haz the power, 2014-11-20 04:49:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/739123002/20001

[commit-bot: I haz the power, 2014-11-20 05:59:00]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2014-11-20 05:59:54]

Patchset 2 (id:??) landed as
https://crrev.com/c73d4a8360141fc2a8a0674a7210c5375cfca457
Cr-Commit-Position: refs/heads/master@{#304984}