Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Unified Diff: chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc

Issue 26800005: chromeos: Remove ScreensaverController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: delete "screensaver" extension permission Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/screensaver/screensaver_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
deleted file mode 100644
index 781c9a180c8d65963253ba09fc419bab869bc733..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-// 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/extensions/extension_service.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/extensions/extension_builder.h"
-#include "chrome/common/extensions/value_builder.h"
-#include "chrome/test/base/in_process_browser_test.h"
-
-namespace {
-
-scoped_refptr<extensions::Extension> CreateTestScreensaverExtension() {
- scoped_refptr<extensions::Extension> extension =
- extensions::ExtensionBuilder()
- .SetPath(base::FilePath())
- .SetManifest(extensions::DictionaryBuilder()
- .Set("name", "Screensaver Extension")
- .Set("version", "1")
- .Set("manifest_version", 2)
- .Set("app", extensions::DictionaryBuilder()
- .Set("launch", extensions::DictionaryBuilder()
- .Set("local_path", "")))
- .Set("permissions", extensions::ListBuilder()
- .Append("screensaver")))
- .Build();
-
- return extension;
-}
-
-void InstallExtensionToDefaultProfile(const extensions::Extension* extension) {
- Profile* default_profile = ProfileManager::GetDefaultProfile();
- EXPECT_TRUE(default_profile);
- ExtensionService* service =
- extensions::ExtensionSystem::Get(default_profile)->extension_service();
- EXPECT_TRUE(service);
-
- service->AddExtension(extension);
-}
-
-} // namespace
-
-namespace chromeos {
-
-class ScreensaverControllerTest : public InProcessBrowserTest {
-};
-
-IN_PROC_BROWSER_TEST_F(ScreensaverControllerTest, Basic) {
- scoped_refptr<extensions::Extension> extension(
- CreateTestScreensaverExtension());
- InstallExtensionToDefaultProfile(extension.get());
-
- scoped_ptr<ScreensaverController> controller_;
- controller_.reset(new ScreensaverController());
- base::MessageLoop::current()->RunUntilIdle();
-
- // Trigger idle.
- controller_->IdleNotify(0);
- EXPECT_TRUE(ash::IsScreensaverShown());
-
- // Trigger active.
- controller_->OnUserActivity(NULL);
- EXPECT_FALSE(ash::IsScreensaverShown());
-};
-
-IN_PROC_BROWSER_TEST_F(ScreensaverControllerTest, OutOfOrder) {
- scoped_refptr<extensions::Extension> extension(
- CreateTestScreensaverExtension());
- InstallExtensionToDefaultProfile(extension.get());
-
- scoped_ptr<ScreensaverController> controller_;
- controller_.reset(new ScreensaverController());
- base::MessageLoop::current()->RunUntilIdle();
-
- // Trigger active.
- controller_->OnUserActivity(NULL);
- 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(NULL);
- EXPECT_FALSE(ash::IsScreensaverShown());
-};
-
-} // namespace chromeos.
« no previous file with comments | « chrome/browser/chromeos/screensaver/screensaver_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698