| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/shell/test/shell_test.h" | 5 #include "extensions/shell/test/shell_test.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "build/build_config.h" |
| 12 #include "content/public/common/content_switches.h" | 13 #include "content/public/common/content_switches.h" |
| 13 #include "extensions/browser/extension_system.h" | 14 #include "extensions/browser/extension_system.h" |
| 14 #include "extensions/shell/browser/desktop_controller.h" | 15 #include "extensions/shell/browser/desktop_controller.h" |
| 15 #include "extensions/shell/browser/shell_content_browser_client.h" | 16 #include "extensions/shell/browser/shell_content_browser_client.h" |
| 16 #include "extensions/shell/browser/shell_extension_system.h" | 17 #include "extensions/shell/browser/shell_extension_system.h" |
| 17 | 18 |
| 18 namespace extensions { | 19 namespace extensions { |
| 19 | 20 |
| 20 AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) { | 21 AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) { |
| 21 #if defined(OS_MACOSX) | 22 #if defined(OS_MACOSX) |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 57 |
| 57 RunTestOnMainThread(); | 58 RunTestOnMainThread(); |
| 58 | 59 |
| 59 TearDownOnMainThread(); | 60 TearDownOnMainThread(); |
| 60 | 61 |
| 61 // Clean up the app window. | 62 // Clean up the app window. |
| 62 DesktopController::instance()->CloseAppWindows(); | 63 DesktopController::instance()->CloseAppWindows(); |
| 63 } | 64 } |
| 64 | 65 |
| 65 } // namespace extensions | 66 } // namespace extensions |
| OLD | NEW |