| Index: extensions/shell/test/shell_test.h
|
| diff --git a/apps/shell/test/shell_test.h b/extensions/shell/test/shell_test.h
|
| similarity index 83%
|
| rename from apps/shell/test/shell_test.h
|
| rename to extensions/shell/test/shell_test.h
|
| index f6aa1482f96665a95e0d7de5dd4e8361d8283fe5..c9d36ed011cdd99916acc3cf1c1764cb1c5aea8b 100644
|
| --- a/apps/shell/test/shell_test.h
|
| +++ b/extensions/shell/test/shell_test.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef APPS_SHELL_TEST_SHELL_TEST_H_
|
| -#define APPS_SHELL_TEST_SHELL_TEST_H_
|
| +#ifndef EXTENSIONS_SHELL_TEST_SHELL_TEST_H_
|
| +#define EXTENSIONS_SHELL_TEST_SHELL_TEST_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/test/browser_test.h"
|
| @@ -18,10 +18,8 @@ class BrowserContext;
|
| }
|
|
|
| namespace extensions {
|
| -class ShellExtensionSystem;
|
| -}
|
|
|
| -namespace apps {
|
| +class ShellExtensionSystem;
|
|
|
| // Base class for app shell browser tests.
|
| class AppShellTest : public content::BrowserTestBase {
|
| @@ -42,9 +40,9 @@ class AppShellTest : public content::BrowserTestBase {
|
|
|
| private:
|
| content::BrowserContext* browser_context_;
|
| - extensions::ShellExtensionSystem* extension_system_;
|
| + ShellExtensionSystem* extension_system_;
|
| };
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|
| -#endif // APPS_SHELL_TEST_SHELL_TEST_H_
|
| +#endif // EXTENSIONS_SHELL_TEST_SHELL_TEST_H_
|
|
|