OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
6 #include "chrome/browser/extensions/extension_service.h" | 6 #include "chrome/browser/extensions/extension_service.h" |
7 #include "chrome/browser/extensions/extension_system.h" | 7 #include "chrome/browser/extensions/extension_system.h" |
8 #include "chrome/browser/extensions/extension_test_message_listener.h" | 8 #include "chrome/browser/extensions/extension_test_message_listener.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/common/extensions/extension.h" | 11 #include "chrome/common/extensions/extension.h" |
12 #include "chrome/test/base/ui_test_utils.h" | 12 #include "chrome/test/base/ui_test_utils.h" |
| 13 #include "extensions/common/id_util.h" |
13 | 14 |
14 const std::string kAllUrlsTarget = | 15 const std::string kAllUrlsTarget = |
15 "files/extensions/api_test/all_urls/index.html"; | 16 "files/extensions/api_test/all_urls/index.html"; |
16 | 17 |
17 typedef ExtensionApiTest AllUrlsApiTest; | 18 typedef ExtensionApiTest AllUrlsApiTest; |
18 | 19 |
19 #if defined(OS_WIN) && !defined(NDEBUG) | 20 #if defined(OS_WIN) && !defined(NDEBUG) |
20 // http://crbug.com/174341 | 21 // http://crbug.com/174341 |
21 #define MAYBE_WhitelistedExtension DISABLED_WhitelistedExtension | 22 #define MAYBE_WhitelistedExtension DISABLED_WhitelistedExtension |
22 #else | 23 #else |
23 #define MAYBE_WhitelistedExtension WhitelistedExtension | 24 #define MAYBE_WhitelistedExtension WhitelistedExtension |
24 #endif | 25 #endif |
25 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) { | 26 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) { |
26 // First setup the two extensions. | 27 // First setup the two extensions. |
27 base::FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") | 28 base::FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") |
28 .AppendASCII("content_script"); | 29 .AppendASCII("content_script"); |
29 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") | 30 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") |
30 .AppendASCII("execute_script"); | 31 .AppendASCII("execute_script"); |
31 | 32 |
32 // Then add the two extensions to the whitelist. | 33 // Then add the two extensions to the whitelist. |
33 extensions::Extension::ScriptingWhitelist whitelist; | 34 extensions::Extension::ScriptingWhitelist whitelist; |
34 whitelist.push_back(extensions::Extension::GenerateIdForPath(extension_dir1)); | 35 whitelist.push_back(extensions::id_util::GenerateIdForPath(extension_dir1)); |
35 whitelist.push_back(extensions::Extension::GenerateIdForPath(extension_dir2)); | 36 whitelist.push_back(extensions::id_util::GenerateIdForPath(extension_dir2)); |
36 extensions::Extension::SetScriptingWhitelist(whitelist); | 37 extensions::Extension::SetScriptingWhitelist(whitelist); |
37 | 38 |
38 // Then load extensions. | 39 // Then load extensions. |
39 ExtensionService* service = extensions::ExtensionSystem::Get( | 40 ExtensionService* service = extensions::ExtensionSystem::Get( |
40 browser()->profile())->extension_service(); | 41 browser()->profile())->extension_service(); |
41 const size_t size_before = service->extensions()->size(); | 42 const size_t size_before = service->extensions()->size(); |
42 ASSERT_TRUE(LoadExtension(extension_dir1)); | 43 ASSERT_TRUE(LoadExtension(extension_dir1)); |
43 ASSERT_TRUE(LoadExtension(extension_dir2)); | 44 ASSERT_TRUE(LoadExtension(extension_dir2)); |
44 EXPECT_EQ(size_before + 2, service->extensions()->size()); | 45 EXPECT_EQ(size_before + 2, service->extensions()->size()); |
45 | 46 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 // Now verify we can script a regular http page. | 108 // Now verify we can script a regular http page. |
108 ASSERT_TRUE(test_server()->Start()); | 109 ASSERT_TRUE(test_server()->Start()); |
109 GURL page_url = test_server()->GetURL(kAllUrlsTarget); | 110 GURL page_url = test_server()->GetURL(kAllUrlsTarget); |
110 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), | 111 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), |
111 false); | 112 false); |
112 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); | 113 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); |
113 ui_test_utils::NavigateToURL(browser(), page_url); | 114 ui_test_utils::NavigateToURL(browser(), page_url); |
114 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); | 115 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); |
115 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); | 116 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); |
116 } | 117 } |
OLD | NEW |