app_shell: Shut down in response to power button.

Also fix a dependency issue in
chromeos_test_support_without_gmock, make
ExtensionsTestSuite call
GLSurface::InitializeOneOffForTests(), and avoid
double-initializating Aura in app_shell.

BUG=405967

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

Cr-Commit-Position: refs/heads/master@{#291607}

3 files changed, 42 insertions, 34 deletions

diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 51cb17a..6a28795 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -491,6 +491,10 @@
     {
       'target_name': 'chromeos_test_support_without_gmock',
       'type': 'static_library',
+      'export_dependent_settings': [
+        # fake_power_manager_client.h includes pb.h files.
+        'power_manager_proto',
+      ],
       'dependencies': [
         '../build/linux/system.gyp:dbus',
         '../crypto/crypto.gyp:crypto',
diff --git a/chromeos/dbus/fake_power_manager_client.cc b/chromeos/dbus/fake_power_manager_client.cc
index 9fbc7d1..5231cf8 100644
--- a/chromeos/dbus/fake_power_manager_client.cc
+++ b/chromeos/dbus/fake_power_manager_client.cc
@@ -11,6 +11,7 @@ namespace chromeos {
 
 FakePowerManagerClient::FakePowerManagerClient()
     : num_request_restart_calls_(0),
+      num_request_shutdown_calls_(0),
       num_set_policy_calls_(0),
       num_set_is_projecting_calls_(0),
       is_projecting_(false) {
@@ -30,19 +31,14 @@ void FakePowerManagerClient::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void FakePowerManagerClient::RequestStatusUpdate() {
-}
-
-void FakePowerManagerClient::SetPolicy(
-    const power_manager::PowerManagementPolicy& policy) {
-  policy_ = policy;
-  ++num_set_policy_calls_;
+bool FakePowerManagerClient::HasObserver(Observer* observer) {
+  return false;
 }
 
-void FakePowerManagerClient::RequestShutdown() {
+void FakePowerManagerClient::DecreaseScreenBrightness(bool allow_off) {
 }
 
-void FakePowerManagerClient::DecreaseScreenBrightness(bool allow_off) {
+void FakePowerManagerClient::IncreaseScreenBrightness() {
 }
 
 void FakePowerManagerClient::SetScreenBrightnessPercent(double percent,
@@ -53,32 +49,34 @@ void FakePowerManagerClient::GetScreenBrightnessPercent(
     const GetScreenBrightnessPercentCallback& callback) {
 }
 
-base::Closure FakePowerManagerClient::GetSuspendReadinessCallback() {
-  return base::Closure();
+void FakePowerManagerClient::DecreaseKeyboardBrightness() {
 }
 
-int FakePowerManagerClient::GetNumPendingSuspendReadinessCallbacks() {
-  return 0;
+void FakePowerManagerClient::IncreaseKeyboardBrightness() {
 }
 
-bool FakePowerManagerClient::HasObserver(Observer* observer) {
-  return false;
+void FakePowerManagerClient::RequestStatusUpdate() {
 }
 
 void FakePowerManagerClient::RequestRestart() {
   ++num_request_restart_calls_;
 }
 
-void FakePowerManagerClient::IncreaseKeyboardBrightness() {
+void FakePowerManagerClient::RequestShutdown() {
+  ++num_request_shutdown_calls_;
 }
 
-void FakePowerManagerClient::IncreaseScreenBrightness() {
+void FakePowerManagerClient::NotifyUserActivity(
+    power_manager::UserActivityType type) {
 }
 
 void FakePowerManagerClient::NotifyVideoActivity(bool is_fullscreen) {
 }
 
-void FakePowerManagerClient::DecreaseKeyboardBrightness() {
+void FakePowerManagerClient::SetPolicy(
+    const power_manager::PowerManagementPolicy& policy) {
+  policy_ = policy;
+  ++num_set_policy_calls_;
 }
 
 void FakePowerManagerClient::SetIsProjecting(bool is_projecting) {
@@ -86,8 +84,12 @@ void FakePowerManagerClient::SetIsProjecting(bool is_projecting) {
   is_projecting_ = is_projecting;
 }
 
-void FakePowerManagerClient::NotifyUserActivity(
-    power_manager::UserActivityType type) {
+base::Closure FakePowerManagerClient::GetSuspendReadinessCallback() {
+  return base::Closure();
+}
+
+int FakePowerManagerClient::GetNumPendingSuspendReadinessCallbacks() {
+  return 0;
 }
 
 void FakePowerManagerClient::SendSuspendImminent() {
@@ -102,4 +104,11 @@ void FakePowerManagerClient::SendDarkSuspendImminent() {
   FOR_EACH_OBSERVER(Observer, observers_, DarkSuspendImminent());
 }
 
+void FakePowerManagerClient::SendPowerButtonEvent(
+    bool down,
+    const base::TimeTicks& timestamp) {
+  FOR_EACH_OBSERVER(Observer, observers_,
+                    PowerButtonEventReceived(down, timestamp));
+}
+
 } // namespace chromeos
diff --git a/chromeos/dbus/fake_power_manager_client.h b/chromeos/dbus/fake_power_manager_client.h
index 893448c..f4b9af5 100644
--- a/chromeos/dbus/fake_power_manager_client.h
+++ b/chromeos/dbus/fake_power_manager_client.h
@@ -24,18 +24,13 @@ class FakePowerManagerClient : public PowerManagerClient {
   virtual ~FakePowerManagerClient();
 
   power_manager::PowerManagementPolicy& policy() { return policy_; }
-  int num_request_restart_calls() const {
-    return num_request_restart_calls_;
-  }
-  int num_set_policy_calls() const {
-    return num_set_policy_calls_;
-  }
+  int num_request_restart_calls() const { return num_request_restart_calls_; }
+  int num_request_shutdown_calls() const { return num_request_shutdown_calls_; }
+  int num_set_policy_calls() const { return num_set_policy_calls_; }
   int num_set_is_projecting_calls() const {
     return num_set_is_projecting_calls_;
   }
-  bool is_projecting() const {
-    return is_projecting_;
-  }
+  bool is_projecting() const { return is_projecting_; }
 
   // PowerManagerClient overrides
   virtual void Init(dbus::Bus* bus) OVERRIDE;
@@ -68,19 +63,19 @@ class FakePowerManagerClient : public PowerManagerClient {
   void SendSuspendDone();
   void SendDarkSuspendImminent();
 
+  // Notifies observers that the power button has been pressed or released.
+  void SendPowerButtonEvent(bool down, const base::TimeTicks& timestamp);
+
  private:
   ObserverList<Observer> observers_;
 
   // Last policy passed to SetPolicy().
   power_manager::PowerManagementPolicy policy_;
 
-  // Number of times that RequestRestart() has been called.
+  // Number of times that various methods have been called.
   int num_request_restart_calls_;
-
-  // Number of times that SetPolicy() has been called.
+  int num_request_shutdown_calls_;
   int num_set_policy_calls_;
-
-  // Count the number of times SetIsProjecting() has been called.
   int num_set_is_projecting_calls_;
 
   // Last projecting state set in SetIsProjecting().