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/logging.h" | 8 #include "base/logging.h" |
9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
10 #include "extensions/browser/extension_system.h" | 10 #include "extensions/browser/extension_system.h" |
11 #include "extensions/shell/browser/shell_content_browser_client.h" | 11 #include "extensions/shell/browser/shell_content_browser_client.h" |
12 #include "extensions/shell/browser/shell_desktop_controller.h" | 12 #include "extensions/shell/browser/shell_desktop_controller.h" |
13 #include "extensions/shell/browser/shell_extension_system.h" | 13 #include "extensions/shell/browser/shell_extension_system.h" |
14 | 14 |
15 namespace extensions { | 15 namespace extensions { |
16 | 16 |
17 AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) { | 17 AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) { |
18 } | 18 } |
19 | 19 |
20 AppShellTest::~AppShellTest() { | 20 AppShellTest::~AppShellTest() { |
21 } | 21 } |
22 | 22 |
23 void AppShellTest::SetUp() { | 23 void AppShellTest::SetUp() { |
24 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 24 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
25 command_line->AppendSwitchASCII(switches::kTestType, "appshell"); | 25 command_line->AppendSwitchASCII(switches::kTestType, "appshell"); |
| 26 SetUpCommandLine(command_line); |
26 content::BrowserTestBase::SetUp(); | 27 content::BrowserTestBase::SetUp(); |
27 } | 28 } |
28 | 29 |
29 void AppShellTest::SetUpOnMainThread() { | 30 void AppShellTest::SetUpOnMainThread() { |
30 browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext(); | 31 browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext(); |
31 | 32 |
32 extension_system_ = static_cast<ShellExtensionSystem*>( | 33 extension_system_ = static_cast<ShellExtensionSystem*>( |
33 ExtensionSystem::Get(browser_context_)); | 34 ExtensionSystem::Get(browser_context_)); |
34 } | 35 } |
35 | 36 |
36 void AppShellTest::RunTestOnMainThreadLoop() { | 37 void AppShellTest::RunTestOnMainThreadLoop() { |
37 base::MessageLoopForUI::current()->RunUntilIdle(); | 38 base::MessageLoopForUI::current()->RunUntilIdle(); |
38 | 39 |
39 SetUpOnMainThread(); | 40 SetUpOnMainThread(); |
40 | 41 |
41 RunTestOnMainThread(); | 42 RunTestOnMainThread(); |
42 | 43 |
43 TearDownOnMainThread(); | 44 TearDownOnMainThread(); |
44 | 45 |
45 // Clean up the app window. | 46 // Clean up the app window. |
46 ShellDesktopController::instance()->CloseAppWindows(); | 47 ShellDesktopController::instance()->CloseAppWindows(); |
47 } | 48 } |
48 | 49 |
49 } // namespace extensions | 50 } // namespace extensions |
OLD | NEW |