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 <map> | 5 #include <map> |
6 | 6 |
7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
8 #include "chrome/browser/extensions/api/management/management_api.h" | 8 #include "chrome/browser/extensions/api/management/management_api.h" |
9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
11 #include "chrome/browser/extensions/extension_test_message_listener.h" | |
12 #include "chrome/browser/extensions/launch_util.h" | 11 #include "chrome/browser/extensions/launch_util.h" |
13 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_commands.h" | 14 #include "chrome/browser/ui/browser_commands.h" |
16 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
17 #include "chrome/browser/ui/browser_iterator.h" | 16 #include "chrome/browser/ui/browser_iterator.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/common/extensions/extension_constants.h" | 19 #include "chrome/common/extensions/extension_constants.h" |
21 #include "content/public/test/test_utils.h" | 20 #include "content/public/test/test_utils.h" |
22 #include "extensions/browser/extension_system.h" | 21 #include "extensions/browser/extension_system.h" |
23 #include "extensions/browser/test_management_policy.h" | 22 #include "extensions/browser/test_management_policy.h" |
24 #include "extensions/common/manifest.h" | 23 #include "extensions/common/manifest.h" |
| 24 #include "extensions/test/extension_test_message_listener.h" |
25 | 25 |
26 using extensions::Extension; | 26 using extensions::Extension; |
27 using extensions::Manifest; | 27 using extensions::Manifest; |
28 | 28 |
29 namespace { | 29 namespace { |
30 | 30 |
31 // Find a browser other than |browser|. | 31 // Find a browser other than |browser|. |
32 Browser* FindOtherBrowser(Browser* browser) { | 32 Browser* FindOtherBrowser(Browser* browser) { |
33 Browser* found = NULL; | 33 Browser* found = NULL; |
34 for (chrome::BrowserIterator it; !it.done(); it.Next()) { | 34 for (chrome::BrowserIterator it; !it.done(); it.Next()) { |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 }; | 342 }; |
343 | 343 |
344 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiStreamlinedAppsTest, LaunchType) { | 344 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiStreamlinedAppsTest, LaunchType) { |
345 LoadExtensions(); | 345 LoadExtensions(); |
346 base::FilePath basedir = test_data_dir_.AppendASCII("management"); | 346 base::FilePath basedir = test_data_dir_.AppendASCII("management"); |
347 LoadNamedExtension(basedir, "packaged_app"); | 347 LoadNamedExtension(basedir, "packaged_app"); |
348 | 348 |
349 ASSERT_TRUE(RunExtensionSubtest("management/test", | 349 ASSERT_TRUE(RunExtensionSubtest("management/test", |
350 "launchType.html?streamlined-hosted-apps")); | 350 "launchType.html?streamlined-hosted-apps")); |
351 } | 351 } |
OLD | NEW |