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

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

Issue 7579001: Disabled ExtensionWebRequestApiTest.WebRequestEvents. (Closed) Base URL: svn://chrome-svn/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 »
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequest) { 53 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequest) {
54 CommandLine::ForCurrentProcess()->AppendSwitch( 54 CommandLine::ForCurrentProcess()->AppendSwitch(
55 switches::kEnableExperimentalExtensionApis); 55 switches::kEnableExperimentalExtensionApis);
56 56
57 ASSERT_TRUE(RunExtensionTest("webrequest/api")) << message_; 57 ASSERT_TRUE(RunExtensionTest("webrequest/api")) << message_;
58 } 58 }
59 59
60 // http://crbug.com/91715 60 // http://crbug.com/91715
61 #if defined(OS_MACOSX) 61 #if defined(OS_MACOSX)
62 #define MAYBE_WebRequestEvents FLAKY_WebRequestEvents 62 #define MAYBE_WebRequestEvents DISABLED_WebRequestEvents
63 #else 63 #else
64 #define MAYBE_WebRequestEvents WebRequestEvents 64 #define MAYBE_WebRequestEvents WebRequestEvents
65 #endif 65 #endif
66 66
67 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestEvents) { 67 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestEvents) {
68 CommandLine::ForCurrentProcess()->AppendSwitch( 68 CommandLine::ForCurrentProcess()->AppendSwitch(
69 switches::kEnableExperimentalExtensionApis); 69 switches::kEnableExperimentalExtensionApis);
70 70
71 CancelLoginDialog login_dialog_helper; 71 CancelLoginDialog login_dialog_helper;
72 72
73 ASSERT_TRUE(RunExtensionTest("webrequest/events")) << message_; 73 ASSERT_TRUE(RunExtensionTest("webrequest/events")) << message_;
74 } 74 }
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