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

Side by Side Diff: chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

Issue 92933002: Enable TabCaptureApiTests.GrantForChromePages on windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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) 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #if defined(OS_MACOSX) 7 #if defined(OS_MACOSX)
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #endif 9 #endif
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 EXPECT_TRUE(fullscreen_entered.WaitUntilSatisfied()); 249 EXPECT_TRUE(fullscreen_entered.WaitUntilSatisfied());
250 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents, 250 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents,
251 false); 251 false);
252 fullscreen_entered.Reply(""); 252 fullscreen_entered.Reply("");
253 253
254 ResultCatcher catcher; 254 ResultCatcher catcher;
255 catcher.RestrictToProfile(browser()->profile()); 255 catcher.RestrictToProfile(browser()->profile());
256 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 256 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
257 } 257 }
258 258
259 // Times out on Win dbg bots: http://crbug.com/177163
260 // #if defined(OS_WIN) && !defined(NDEBUG)
261 // Times out on all Win bots: http://crbug.com/294431
262 #if defined(OS_WIN)
263 #define MAYBE_GrantForChromePages DISABLED_GrantForChromePages
264 #else
265 #define MAYBE_GrantForChromePages GrantForChromePages
266 #endif
267 // Make sure tabCapture API can be granted for Chrome:// pages. 259 // Make sure tabCapture API can be granted for Chrome:// pages.
268 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GrantForChromePages) { 260 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, GrantForChromePages) {
269 ExtensionTestMessageListener before_open_tab("ready1", true); 261 ExtensionTestMessageListener before_open_tab("ready1", true);
270 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", 262 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental",
271 "active_tab_chrome_pages.html")) << message_; 263 "active_tab_chrome_pages.html")) << message_;
272 EXPECT_TRUE(before_open_tab.WaitUntilSatisfied()); 264 EXPECT_TRUE(before_open_tab.WaitUntilSatisfied());
273 265
274 // Open a tab on a chrome:// page and make sure we can capture. 266 // Open a tab on a chrome:// page and make sure we can capture.
275 content::OpenURLParams params(GURL("chrome://version"), content::Referrer(), 267 content::OpenURLParams params(GURL("chrome://version"), content::Referrer(),
276 NEW_FOREGROUND_TAB, 268 NEW_FOREGROUND_TAB,
277 content::PAGE_TRANSITION_LINK, false); 269 content::PAGE_TRANSITION_LINK, false);
278 content::WebContents* web_contents = browser()->OpenURL(params); 270 content::WebContents* web_contents = browser()->OpenURL(params);
(...skipping 27 matching lines...) Expand all
306 #if defined(OS_WIN) && !defined(NDEBUG) 298 #if defined(OS_WIN) && !defined(NDEBUG)
307 #define MAYBE_Constraints DISABLED_Constraints 299 #define MAYBE_Constraints DISABLED_Constraints
308 #else 300 #else
309 #define MAYBE_Constraints Constraints 301 #define MAYBE_Constraints Constraints
310 #endif 302 #endif
311 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) { 303 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_Constraints) {
312 AddExtensionToCommandLineWhitelist(); 304 AddExtensionToCommandLineWhitelist();
313 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", 305 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental",
314 "constraints.html")) << message_; 306 "constraints.html")) << message_;
315 } 307 }
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