Revert of Revert of chromeos: Don't send empty power management policies.

chrome/browser/apps/app_browsertest.cc

 // Copyright 2013 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 "apps/launcher.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1242 matching lines @@
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     user_manager_enabler_.reset();
     PlatformAppBrowserTest::CleanUpOnMainThread();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     PlatformAppBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
-  int request_restart_call_count() const {
-    return power_manager_client_->request_restart_call_count();
+  int num_request_restart_calls() const {
+    return power_manager_client_->num_request_restart_calls();
   }
 
  private:
   chromeos::FakePowerManagerClient* power_manager_client_;
   chromeos::MockUserManager* mock_user_manager_;
   scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(RestartDeviceTest);
 };
 
 // Tests that chrome.runtime.restart would request device restart in
 // ChromeOS kiosk mode.
 IN_PROC_BROWSER_TEST_F(RestartDeviceTest, Restart) {
-  ASSERT_EQ(0, request_restart_call_count());
+  ASSERT_EQ(0, num_request_restart_calls());
 
   ExtensionTestMessageListener launched_listener("Launched", true);
   const Extension* extension = LoadAndLaunchPlatformApp("restart_device");
   ASSERT_TRUE(extension);
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
   launched_listener.Reply("restart");
   ExtensionTestMessageListener restart_requested_listener("restartRequested",
                                                           false);
   ASSERT_TRUE(restart_requested_listener.WaitUntilSatisfied());
 
-  EXPECT_EQ(1, request_restart_call_count());
+  EXPECT_EQ(1, num_request_restart_calls());
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 
 }  // namespace extensions