OLD | NEW |
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 Loading... |
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 // http://crbug.com/177163 |
| 260 #if defined(OS_WIN) && !defined(NDEBUG) |
| 261 #define MAYBE_GrantForChromePages DISABLED_GrantForChromePages |
| 262 #else |
| 263 #define MAYBE_GrantForChromePages GrantForChromePages |
| 264 #endif |
259 // Make sure tabCapture API can be granted for Chrome:// pages. | 265 // Make sure tabCapture API can be granted for Chrome:// pages. |
260 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, GrantForChromePages) { | 266 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GrantForChromePages) { |
261 ExtensionTestMessageListener before_open_tab("ready1", true); | 267 ExtensionTestMessageListener before_open_tab("ready1", true); |
262 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", | 268 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", |
263 "active_tab_chrome_pages.html")) << message_; | 269 "active_tab_chrome_pages.html")) << message_; |
264 EXPECT_TRUE(before_open_tab.WaitUntilSatisfied()); | 270 EXPECT_TRUE(before_open_tab.WaitUntilSatisfied()); |
265 | 271 |
266 // Open a tab on a chrome:// page and make sure we can capture. | 272 // Open a tab on a chrome:// page and make sure we can capture. |
267 content::OpenURLParams params(GURL("chrome://version"), content::Referrer(), | 273 content::OpenURLParams params(GURL("chrome://version"), content::Referrer(), |
268 NEW_FOREGROUND_TAB, | 274 NEW_FOREGROUND_TAB, |
269 content::PAGE_TRANSITION_LINK, false); | 275 content::PAGE_TRANSITION_LINK, false); |
270 content::WebContents* web_contents = browser()->OpenURL(params); | 276 content::WebContents* web_contents = browser()->OpenURL(params); |
271 ExtensionService* extension_service = | 277 ExtensionService* extension_service = |
272 Profile::FromBrowserContext(web_contents->GetBrowserContext()) | 278 Profile::FromBrowserContext(web_contents->GetBrowserContext()) |
273 ->GetExtensionService(); | 279 ->GetExtensionService(); |
274 extensions::TabHelper::FromWebContents(web_contents) | 280 extensions::TabHelper::FromWebContents(web_contents) |
275 ->active_tab_permission_granter()->GrantIfRequested( | 281 ->active_tab_permission_granter()->GrantIfRequested( |
276 extension_service->GetExtensionById(kExtensionId, false)); | 282 extension_service->GetExtensionById(kExtensionId, false)); |
277 before_open_tab.Reply(""); | 283 before_open_tab.Reply(""); |
278 | 284 |
279 ResultCatcher catcher; | 285 ResultCatcher catcher; |
280 catcher.RestrictToProfile(browser()->profile()); | 286 catcher.RestrictToProfile(browser()->profile()); |
281 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 287 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
282 } | 288 } |
283 | 289 |
284 } // namespace chrome | 290 } // namespace chrome |
OLD | NEW |