Screensaver implementation for ChromeOS.

chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc

Index: chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc b/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f386db491e968aedaf263191afd31319402a4810
--- /dev/null
+++ b/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc
@@ -0,0 +1,62 @@
+// Copyright (c) 2012 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 "chrome/browser/chromeos/screensaver/screensaver_controller.h"
+
+#include "ash/screensaver/screensaver_view.h"
+#include "chrome/browser/extensions/extension_browsertest.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/test/base/in_process_browser_test.h"
+
+namespace chromeos {
+
+class ScreensaverControllerTest : public ExtensionBrowserTest {
+};
+
+IN_PROC_BROWSER_TEST_F(ScreensaverControllerTest, Basic) {
+  const extensions::Extension* extension = InstallExtension(

[Matt Perry, 2013/01/31 00:37:23]

This test could probably be made into a lighter-weight test (possibly even a
unit test) by not using a .crx on disk. See, e.g.
https://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/common/extensions/...
for how to create an in-memory Extension. You can then load it using
ExtensionService::AddExtension.

[rkc, 2013/01/31 02:15:46]

I reworked the code quite a bit to try to make this work. I can create an test
extension but for some reason "AddExtension" crashes in InitializePermissions.
Is there anything else I need to do to ensure that the 'screensaver' permission
is added and added correctly?

This is what the stack looks like,
 [0x000002700ab0] base::debug::StackTrace::StackTrace()
 [0x0000027271a9] logging::LogMessage::~LogMessage()
 [0x000001e4e155] ExtensionService::InitializePermissions()
 [0x000001e4d72c] ExtensionService::AddExtension()
 [0x00000056a082] (anonymous namespace)::InstallExtensionToDefaultProfile()
 [0x00000056a357]
chromeos::ScreensaverControllerTest_OutOfOrder_Test::RunTestOnMainThread()
 [0x0000021e898d] InProcessBrowserTest::RunTestOnMainThreadLoop()
.
.
.

[rkc, 2013/01/31 02:53:18]

Fixed the tests, they pass now.

+      test_data_dir_.AppendASCII("screensaver_test_extension.crx"), 1);
+  ASSERT_TRUE(extension);
+
+  scoped_ptr<ScreensaverController> controller_;
+  controller_.reset(new ScreensaverController());
+  MessageLoop::current()->RunUntilIdle();
+
+  // Trigger idle.
+  controller_->IdleNotify(0);
+  EXPECT_TRUE(ash::IsScreensaverShown());
+
+  // Trigger active.
+  controller_->OnUserActivity();
+  EXPECT_FALSE(ash::IsScreensaverShown());
+};
+
+IN_PROC_BROWSER_TEST_F(ScreensaverControllerTest, OutOfOrder) {
+  const extensions::Extension* extension = InstallExtension(
+      test_data_dir_.AppendASCII("screensaver_test_extension.crx"), 1);
+  ASSERT_TRUE(extension);
+
+  scoped_ptr<ScreensaverController> controller_;
+  controller_.reset(new ScreensaverController());
+  MessageLoop::current()->RunUntilIdle();
+
+  // Trigger active.
+  controller_->OnUserActivity();
+  EXPECT_FALSE(ash::IsScreensaverShown());
+
+  // Trigger idle.
+  controller_->IdleNotify(0);
+  EXPECT_TRUE(ash::IsScreensaverShown());
+
+
+  // Trigger idle.
+  controller_->IdleNotify(0);
+  EXPECT_TRUE(ash::IsScreensaverShown());
+
+  // Trigger active.
+  controller_->OnUserActivity();
+  EXPECT_FALSE(ash::IsScreensaverShown());
+};
+
+}  // namespace chromeos.