| 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/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | |
| 9 #include "base/logging.h" | 8 #include "base/logging.h" |
| 10 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 11 #include "extensions/browser/extension_system.h" | 10 #include "extensions/browser/extension_system.h" |
| 12 #include "extensions/shell/browser/shell_content_browser_client.h" | 11 #include "extensions/shell/browser/shell_content_browser_client.h" |
| 13 #include "extensions/shell/browser/shell_desktop_controller.h" | 12 #include "extensions/shell/browser/shell_desktop_controller.h" |
| 14 #include "extensions/shell/browser/shell_extension_system.h" | 13 #include "extensions/shell/browser/shell_extension_system.h" |
| 15 | 14 |
| 16 namespace extensions { | 15 namespace extensions { |
| 17 | 16 |
| 18 AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) { | 17 AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) { |
| (...skipping 21 matching lines...) Expand all Loading... |
| 40 SetUpOnMainThread(); | 39 SetUpOnMainThread(); |
| 41 | 40 |
| 42 RunTestOnMainThread(); | 41 RunTestOnMainThread(); |
| 43 | 42 |
| 44 TearDownOnMainThread(); | 43 TearDownOnMainThread(); |
| 45 | 44 |
| 46 // Clean up the app window. | 45 // Clean up the app window. |
| 47 ShellDesktopController::instance()->CloseAppWindows(); | 46 ShellDesktopController::instance()->CloseAppWindows(); |
| 48 } | 47 } |
| 49 | 48 |
| 50 bool AppShellTest::LoadAndLaunchApp(const base::FilePath& app_dir) { | |
| 51 bool loaded = extension_system_->LoadApp(app_dir); | |
| 52 if (loaded) | |
| 53 extension_system_->LaunchApp(); | |
| 54 return loaded; | |
| 55 } | |
| 56 | |
| 57 } // namespace extensions | 49 } // namespace extensions |
| OLD | NEW |