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

Unified Diff: extensions/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 | « extensions/shell/test/shell_test.h ('k') | extensions/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: extensions/shell/test/shell_test.cc
diff --git a/apps/shell/test/shell_test.cc b/extensions/shell/test/shell_test.cc
similarity index 69%
rename from apps/shell/test/shell_test.cc
rename to extensions/shell/test/shell_test.cc
index c5ca5df71afc0b28257878fc0d08ac2d67fc4373..e67400db97e5eb0a0dab8520c5ac9bc13624b7ef 100644
--- a/apps/shell/test/shell_test.cc
+++ b/extensions/shell/test/shell_test.cc
@@ -2,23 +2,24 @@
// 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 "extensions/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"
+#include "extensions/shell/browser/shell_content_browser_client.h"
+#include "extensions/shell/browser/shell_desktop_controller.h"
+#include "extensions/shell/browser/shell_extension_system.h"
-namespace apps {
+namespace extensions {
-AppShellTest::AppShellTest()
- : browser_context_(NULL), extension_system_(NULL) {}
+AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) {
+}
-AppShellTest::~AppShellTest() {}
+AppShellTest::~AppShellTest() {
+}
void AppShellTest::SetUp() {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -29,8 +30,8 @@ void AppShellTest::SetUp() {
void AppShellTest::SetUpOnMainThread() {
browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext();
- extension_system_ = static_cast<extensions::ShellExtensionSystem*>(
- extensions::ExtensionSystem::Get(browser_context_));
+ extension_system_ = static_cast<ShellExtensionSystem*>(
+ ExtensionSystem::Get(browser_context_));
}
void AppShellTest::RunTestOnMainThreadLoop() {
@@ -53,4 +54,4 @@ bool AppShellTest::LoadAndLaunchApp(const base::FilePath& app_dir) {
return loaded;
}
-} // namespace apps
+} // namespace extensions
« no previous file with comments | « extensions/shell/test/shell_test.h ('k') | extensions/shell/test/shell_test_launcher_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698