chrome/browser/extensions/extension_webrequest_apitest.cc - Issue 7623008: Disable WebRequestBlocking, it's failing more or less consistently on ChromiumOS.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 7623008: Disable WebRequestBlocking, it's failing more or less consistently on ChromiumOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 | no next file » | no next file with comments »

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 "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 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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)	79 #if defined(OS_CHROMEOS) \|\| defined(OS_MACOSX)

80 // Times out: http://crbug.com/91715	80 // Times out: http://crbug.com/91715

81 // TODO(mpcomplete): currently investigating, please don't disable yet.	81 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking

82 #define MAYBE_WebRequestBlocking FLAKY_WebRequestBlocking

83 #else	82 #else

84 #define MAYBE_WebRequestBlocking WebRequestBlocking	83 #define MAYBE_WebRequestBlocking WebRequestBlocking

85 #endif	84 #endif

86	85

87 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) {	86 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) {

88 CommandLine::ForCurrentProcess()->AppendSwitch(	87 CommandLine::ForCurrentProcess()->AppendSwitch(

89 switches::kEnableExperimentalExtensionApis);	88 switches::kEnableExperimentalExtensionApis);

90	89

91 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) <<	90 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) <<

92 message_;	91 message_;

93 }	92 }

OLD	NEW