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

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

Issue 1080143002: Disable ExtensionsStartupTest.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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) 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 <vector> 5 #include <vector>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 int num_expected_extensions_; 192 int num_expected_extensions_;
193 }; 193 };
194 194
195 195
196 // ExtensionsStartupTest 196 // ExtensionsStartupTest
197 // Ensures that we can startup the browser with --enable-extensions and some 197 // Ensures that we can startup the browser with --enable-extensions and some
198 // extensions installed and see them run and do basic things. 198 // extensions installed and see them run and do basic things.
199 typedef ExtensionStartupTestBase ExtensionsStartupTest; 199 typedef ExtensionStartupTestBase ExtensionsStartupTest;
200 200
201 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, Test) { 201 // Broken in official builds, http://crbug.com/474659
202 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, DISABLED_Test) {
202 WaitForServicesToStart(num_expected_extensions_, true); 203 WaitForServicesToStart(num_expected_extensions_, true);
203 TestInjection(true, true); 204 TestInjection(true, true);
204 } 205 }
205 206
207 // Broken in official builds, http://crbug.com/474659
206 // Sometimes times out on Mac. http://crbug.com/48151 208 // Sometimes times out on Mac. http://crbug.com/48151
207 #if defined(OS_MACOSX)
208 #define MAYBE_NoFileAccess DISABLED_NoFileAccess
209 #else
210 #define MAYBE_NoFileAccess NoFileAccess
211 #endif
212 // Tests that disallowing file access on an extension prevents it from injecting 209 // Tests that disallowing file access on an extension prevents it from injecting
213 // script into a page with a file URL. 210 // script into a page with a file URL.
214 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) { 211 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, DISABLED_NoFileAccess) {
215 WaitForServicesToStart(num_expected_extensions_, true); 212 WaitForServicesToStart(num_expected_extensions_, true);
216 213
217 // Keep a separate list of extensions for which to disable file access, since 214 // Keep a separate list of extensions for which to disable file access, since
218 // doing so reloads them. 215 // doing so reloads them.
219 std::vector<const extensions::Extension*> extension_list; 216 std::vector<const extensions::Extension*> extension_list;
220 217
221 extensions::ExtensionRegistry* registry = 218 extensions::ExtensionRegistry* registry =
222 extensions::ExtensionRegistry::Get(browser()->profile()); 219 extensions::ExtensionRegistry::Get(browser()->profile());
223 for (extensions::ExtensionSet::const_iterator it = 220 for (extensions::ExtensionSet::const_iterator it =
224 registry->enabled_extensions().begin(); 221 registry->enabled_extensions().begin();
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 .AppendASCII("extensions") 300 .AppendASCII("extensions")
304 .AppendASCII("app2"); 301 .AppendASCII("app2");
305 load_extensions_.push_back(fourth_extension_path.value()); 302 load_extensions_.push_back(fourth_extension_path.value());
306 } 303 }
307 }; 304 };
308 305
309 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) { 306 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) {
310 WaitForServicesToStart(4, true); 307 WaitForServicesToStart(4, true);
311 TestInjection(true, true); 308 TestInjection(true, true);
312 } 309 }
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