OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/platform_app_browsertest_util.h" | 5 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "chrome/browser/extensions/api/tabs/tabs.h" | 9 #include "chrome/browser/extensions/api/tabs/tabs.h" |
10 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
11 #include "chrome/browser/extensions/shell_window_registry.h" | 11 #include "chrome/browser/extensions/shell_window_registry.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/extensions/application_launch.h" | 13 #include "chrome/browser/ui/extensions/application_launch.h" |
14 #include "chrome/browser/ui/extensions/shell_window.h" | 14 #include "chrome/browser/ui/extensions/shell_window.h" |
15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
16 #include "content/public/browser/notification_service.h" | 16 #include "content/public/browser/notification_service.h" |
17 #include "content/public/test/test_utils.h" | 17 #include "content/public/test/test_utils.h" |
18 | 18 |
19 using content::WebContents; | 19 using content::WebContents; |
20 | 20 |
21 namespace utils = extension_function_test_utils; | 21 namespace utils = extension_function_test_utils; |
22 | 22 |
23 namespace extensions { | 23 namespace extensions { |
24 | 24 |
25 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) { | 25 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) { |
26 ExtensionBrowserTest::SetUpCommandLine(command_line); | 26 ExtensionBrowserTest::SetUpCommandLine(command_line); |
27 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 27 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
28 } | 28 } |
29 | 29 |
| 30 void PlatformAppBrowserTest::SetUpOnMainThread() { |
| 31 mock_external_url_controller_.reset(new MockExternalUrlController()); |
| 32 ShellWindow::SetExternalUrlControllerForTesting( |
| 33 mock_external_url_controller_.get()); |
| 34 } |
| 35 |
30 const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp( | 36 const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp( |
31 const char* name) { | 37 const char* name) { |
32 content::WindowedNotificationObserver app_loaded_observer( | 38 content::WindowedNotificationObserver app_loaded_observer( |
33 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, | 39 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, |
34 content::NotificationService::AllSources()); | 40 content::NotificationService::AllSources()); |
35 | 41 |
36 const Extension* extension = LoadExtension( | 42 const Extension* extension = LoadExtension( |
37 test_data_dir_.AppendASCII("platform_apps").AppendASCII(name)); | 43 test_data_dir_.AppendASCII("platform_apps").AppendASCII(name)); |
38 EXPECT_TRUE(extension); | 44 EXPECT_TRUE(extension); |
39 | 45 |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 | 147 |
142 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { | 148 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { |
143 content::WindowedNotificationObserver destroyed_observer( | 149 content::WindowedNotificationObserver destroyed_observer( |
144 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, | 150 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, |
145 content::NotificationService::AllSources()); | 151 content::NotificationService::AllSources()); |
146 window->GetBaseWindow()->Close(); | 152 window->GetBaseWindow()->Close(); |
147 destroyed_observer.Wait(); | 153 destroyed_observer.Wait(); |
148 } | 154 } |
149 | 155 |
150 } // namespace extensions | 156 } // namespace extensions |
OLD | NEW |