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

Unified Diff: apps/shell/test/shell_test.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 40% Created 6 years, 5 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 | « apps/shell/test/shell_test.h ('k') | apps/shell/test/shell_test_launcher_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/test/shell_test.cc
diff --git a/apps/shell/test/shell_test.cc b/apps/shell/test/shell_test.cc
deleted file mode 100644
index c5ca5df71afc0b28257878fc0d08ac2d67fc4373..0000000000000000000000000000000000000000
--- a/apps/shell/test/shell_test.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2014 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/shell/test/shell_test.h"
-
-#include "apps/shell/browser/shell_content_browser_client.h"
-#include "apps/shell/browser/shell_desktop_controller.h"
-#include "apps/shell/browser/shell_extension_system.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "content/public/common/content_switches.h"
-#include "extensions/browser/extension_system.h"
-
-namespace apps {
-
-AppShellTest::AppShellTest()
- : browser_context_(NULL), extension_system_(NULL) {}
-
-AppShellTest::~AppShellTest() {}
-
-void AppShellTest::SetUp() {
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- command_line->AppendSwitchASCII(switches::kTestType, "appshell");
- content::BrowserTestBase::SetUp();
-}
-
-void AppShellTest::SetUpOnMainThread() {
- browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext();
-
- extension_system_ = static_cast<extensions::ShellExtensionSystem*>(
- extensions::ExtensionSystem::Get(browser_context_));
-}
-
-void AppShellTest::RunTestOnMainThreadLoop() {
- base::MessageLoopForUI::current()->RunUntilIdle();
-
- SetUpOnMainThread();
-
- RunTestOnMainThread();
-
- TearDownOnMainThread();
-
- // Clean up the app window.
- ShellDesktopController::instance()->CloseAppWindows();
-}
-
-bool AppShellTest::LoadAndLaunchApp(const base::FilePath& app_dir) {
- bool loaded = extension_system_->LoadApp(app_dir);
- if (loaded)
- extension_system_->LaunchApp();
- return loaded;
-}
-
-} // namespace apps
« no previous file with comments | « apps/shell/test/shell_test.h ('k') | apps/shell/test/shell_test_launcher_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698