| 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
|
|
|