Revert 264067 "app_shell: Initialize chromeos::DBusThreadManager."

> app_shell: Initialize chromeos::DBusThreadManager.
> 
> Let app_shell communicate with Chrome OS system processes.
> Also start notifying the power manager about user activity.
> 
> BUG=354711
> TBR=sky@chromium.org
> 
> Review URL: https://codereview.chromium.org/239433002

TBR=derat@chromium.org

Review URL: https://codereview.chromium.org/239823003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264071 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 15 deletions

diff --git a/ui/chromeos/ui_chromeos.gyp b/ui/chromeos/ui_chromeos.gyp
index 7f7362e..e276880 100644
--- a/ui/chromeos/ui_chromeos.gyp
+++ b/ui/chromeos/ui_chromeos.gyp
@@ -19,8 +19,8 @@
         'UI_CHROMEOS_IMPLEMENTATION',
       ],
       'sources': [
-        'user_activity_power_manager_notifier.cc',
-        'user_activity_power_manager_notifier.h',
+        'user_activity_notifier.cc',
+        'user_activity_notifier.h',
       ],
     },
   ],
diff --git a/ui/chromeos/user_activity_power_manager_notifier.cc b/ui/chromeos/user_activity_notifier.cc
index 7952b59..53f3129 100644
--- a/ui/chromeos/user_activity_power_manager_notifier.cc
+++ b/ui/chromeos/user_activity_notifier.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/chromeos/user_activity_power_manager_notifier.h"
+#include "ui/chromeos/user_activity_notifier.h"
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ -41,17 +41,16 @@ power_manager::UserActivityType GetUserActivityTypeForEvent(
 
 }  // namespace
 
-UserActivityPowerManagerNotifier::UserActivityPowerManagerNotifier(
-    ::wm::UserActivityDetector* detector)
+UserActivityNotifier::UserActivityNotifier(::wm::UserActivityDetector* detector)
     : detector_(detector) {
   detector_->AddObserver(this);
 }
 
-UserActivityPowerManagerNotifier::~UserActivityPowerManagerNotifier() {
+UserActivityNotifier::~UserActivityNotifier() {
   detector_->RemoveObserver(this);
 }
 
-void UserActivityPowerManagerNotifier::OnUserActivity(const Event* event) {
+void UserActivityNotifier::OnUserActivity(const Event* event) {
   base::TimeTicks now = base::TimeTicks::Now();
   // InSeconds() truncates rather than rounding, so it's fine for this
   // comparison.
diff --git a/ui/chromeos/user_activity_power_manager_notifier.h b/ui/chromeos/user_activity_notifier.h
index 483f1b5..dab5955 100644
--- a/ui/chromeos/user_activity_power_manager_notifier.h
+++ b/ui/chromeos/user_activity_notifier.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_CHROMEOS_USER_ACTIVITY_POWER_MANAGER_NOTIFIER_H_
-#define UI_CHROMEOS_USER_ACTIVITY_POWER_MANAGER_NOTIFIER_H_
+#ifndef UI_CHROMEOS_USER_ACTIVITY_NOTIFIER_H_
+#define UI_CHROMEOS_USER_ACTIVITY_NOTIFIER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -18,12 +18,11 @@ class UserActivityDetector;
 namespace ui {
 
 // Notifies the power manager when the user is active.
-class UI_CHROMEOS_EXPORT UserActivityPowerManagerNotifier
+class UI_CHROMEOS_EXPORT UserActivityNotifier
     : public ::wm::UserActivityObserver {
  public:
-  explicit UserActivityPowerManagerNotifier(
-      ::wm::UserActivityDetector* detector);
-  virtual ~UserActivityPowerManagerNotifier();
+  explicit UserActivityNotifier(::wm::UserActivityDetector* detector);
+  virtual ~UserActivityNotifier();
 
   // UserActivityObserver implementation.
   virtual void OnUserActivity(const Event* event) OVERRIDE;
@@ -34,9 +33,9 @@ class UI_CHROMEOS_EXPORT UserActivityPowerManagerNotifier
   // Last time that the power manager was notified.
   base::TimeTicks last_notify_time_;
 
-  DISALLOW_COPY_AND_ASSIGN(UserActivityPowerManagerNotifier);
+  DISALLOW_COPY_AND_ASSIGN(UserActivityNotifier);
 };
 
 }  // namespace ui
 
-#endif  // UI_CHROMEOS_USER_ACTIVITY_POWER_MANAGER_NOTIFIER_H_
+#endif  // UI_CHROMEOS_USER_ACTIVITY_NOTIFIER_H_