Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: chrome/browser/extensions/all_urls_apitest.cc

Issue 682593002: Use embedded test server instead of spawned one in AllUrlsApiTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Line endings.... lets hope it goes well this time. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/test/base/test_switches.h" 10 #include "chrome/test/base/test_switches.h"
11 #include "chrome/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "components/crx_file/id_util.h" 12 #include "components/crx_file/id_util.h"
13 #include "extensions/browser/extension_system.h" 13 #include "extensions/browser/extension_system.h"
14 #include "extensions/common/extension.h" 14 #include "extensions/common/extension.h"
15 #include "extensions/common/extensions_client.h" 15 #include "extensions/common/extensions_client.h"
16 #include "extensions/test/extension_test_message_listener.h" 16 #include "extensions/test/extension_test_message_listener.h"
17 #include "net/test/embedded_test_server/embedded_test_server.h"
17 18
18 const std::string kAllUrlsTarget = 19 const std::string kAllUrlsTarget = "/extensions/api_test/all_urls/index.html";
19 "files/extensions/api_test/all_urls/index.html";
20 20
21 typedef ExtensionApiTest AllUrlsApiTest; 21 typedef ExtensionApiTest AllUrlsApiTest;
22 22
23 #if defined(OS_WIN) && !defined(NDEBUG) 23 #if defined(OS_WIN) && !defined(NDEBUG)
24 // http://crbug.com/174341 24 // http://crbug.com/174341
25 #define MAYBE_WhitelistedExtension DISABLED_WhitelistedExtension 25 #define MAYBE_WhitelistedExtension DISABLED_WhitelistedExtension
26 #else 26 #else
27 #define MAYBE_WhitelistedExtension WhitelistedExtension 27 #define MAYBE_WhitelistedExtension WhitelistedExtension
28 #endif 28 #endif
29 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) { 29 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 // Now verify about:blank. 82 // Now verify about:blank.
83 url = "about:blank"; 83 url = "about:blank";
84 ExtensionTestMessageListener listener4a("content script: " + url, false); 84 ExtensionTestMessageListener listener4a("content script: " + url, false);
85 ExtensionTestMessageListener listener4b("execute: " + url, false); 85 ExtensionTestMessageListener listener4b("execute: " + url, false);
86 ui_test_utils::NavigateToURL(browser(), GURL(url)); 86 ui_test_utils::NavigateToURL(browser(), GURL(url));
87 ASSERT_TRUE(listener4a.WaitUntilSatisfied()); 87 ASSERT_TRUE(listener4a.WaitUntilSatisfied());
88 ASSERT_TRUE(listener4b.WaitUntilSatisfied()); 88 ASSERT_TRUE(listener4b.WaitUntilSatisfied());
89 89
90 // Now verify we can script a regular http page. 90 // Now verify we can script a regular http page.
91 ASSERT_TRUE(test_server()->Start()); 91 ASSERT_TRUE(StartEmbeddedTestServer());
92 GURL page_url = test_server()->GetURL(kAllUrlsTarget); 92 GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget);
93 ExtensionTestMessageListener listener5a("content script: " + page_url.spec(), 93 ExtensionTestMessageListener listener5a("content script: " + page_url.spec(),
94 false); 94 false);
95 ExtensionTestMessageListener listener5b("execute: " + page_url.spec(), false); 95 ExtensionTestMessageListener listener5b("execute: " + page_url.spec(), false);
96 ui_test_utils::NavigateToURL(browser(), page_url); 96 ui_test_utils::NavigateToURL(browser(), page_url);
97 ASSERT_TRUE(listener5a.WaitUntilSatisfied()); 97 ASSERT_TRUE(listener5a.WaitUntilSatisfied());
98 ASSERT_TRUE(listener5b.WaitUntilSatisfied()); 98 ASSERT_TRUE(listener5b.WaitUntilSatisfied());
99 } 99 }
100 100
101 // Test that an extension NOT whitelisted for scripting can ask for <all_urls> 101 // Test that an extension NOT whitelisted for scripting can ask for <all_urls>
102 // and run scripts on non-restricted all pages. 102 // and run scripts on non-restricted all pages.
103 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) { 103 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) {
104 // First load the two extensions. 104 // First load the two extensions.
105 base::FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") 105 base::FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls")
106 .AppendASCII("content_script"); 106 .AppendASCII("content_script");
107 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") 107 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls")
108 .AppendASCII("execute_script"); 108 .AppendASCII("execute_script");
109 109
110 ExtensionService* service = extensions::ExtensionSystem::Get( 110 ExtensionService* service = extensions::ExtensionSystem::Get(
111 browser()->profile())->extension_service(); 111 browser()->profile())->extension_service();
112 const size_t size_before = service->extensions()->size(); 112 const size_t size_before = service->extensions()->size();
113 ASSERT_TRUE(LoadExtension(extension_dir1)); 113 ASSERT_TRUE(LoadExtension(extension_dir1));
114 ASSERT_TRUE(LoadExtension(extension_dir2)); 114 ASSERT_TRUE(LoadExtension(extension_dir2));
115 EXPECT_EQ(size_before + 2, service->extensions()->size()); 115 EXPECT_EQ(size_before + 2, service->extensions()->size());
116 116
117 // Now verify we can script a regular http page. 117 // Now verify we can script a regular http page.
118 ASSERT_TRUE(test_server()->Start()); 118 ASSERT_TRUE(StartEmbeddedTestServer());
119 GURL page_url = test_server()->GetURL(kAllUrlsTarget); 119 GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget);
120 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), 120 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(),
121 false); 121 false);
122 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); 122 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false);
123 ui_test_utils::NavigateToURL(browser(), page_url); 123 ui_test_utils::NavigateToURL(browser(), page_url);
124 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); 124 ASSERT_TRUE(listener1a.WaitUntilSatisfied());
125 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); 125 ASSERT_TRUE(listener1b.WaitUntilSatisfied());
126 } 126 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698