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

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

Issue 7635003: Attempt to fix hanging WebRequestBlocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ugh Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/webrequest/framework.js » ('j') | 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_webrequest_api.h" 7 #include "chrome/browser/extensions/extension_webrequest_api.h"
8 #include "chrome/browser/ui/login/login_prompt.h" 8 #include "chrome/browser/ui/login/login_prompt.h"
9 #include "chrome/common/chrome_notification_types.h" 9 #include "chrome/common/chrome_notification_types.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 CommandLine::ForCurrentProcess()->AppendSwitch( 69 CommandLine::ForCurrentProcess()->AppendSwitch(
70 switches::kEnableExperimentalExtensionApis); 70 switches::kEnableExperimentalExtensionApis);
71 71
72 // Needed for the auth tests. 72 // Needed for the auth tests.
73 CancelLoginDialog login_dialog_helper; 73 CancelLoginDialog login_dialog_helper;
74 74
75 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << 75 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) <<
76 message_; 76 message_;
77 } 77 }
78 78
79 #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(O S_WIN) 79 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestBlocking) {
80 // Times out: http://crbug.com/91715, http://crbug.com/93062.
81 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking
82 #else
83 #define MAYBE_WebRequestBlocking WebRequestBlocking
84 #endif
85
86 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) {
87 CommandLine::ForCurrentProcess()->AppendSwitch( 80 CommandLine::ForCurrentProcess()->AppendSwitch(
88 switches::kEnableExperimentalExtensionApis); 81 switches::kEnableExperimentalExtensionApis);
89 82
90 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << 83 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) <<
91 message_; 84 message_;
92 } 85 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/webrequest/framework.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698