Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
| 9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
| 10 #include "chrome/browser/prerender/prerender_link_manager.h" | 10 #include "chrome/browser/prerender/prerender_link_manager.h" |
| (...skipping 2406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2417 // Get an existing registered rule for the guest. | 2417 // Get an existing registered rule for the guest. |
| 2418 extensions::RulesRegistry* registry = | 2418 extensions::RulesRegistry* registry = |
| 2419 registry_service->GetRulesRegistry( | 2419 registry_service->GetRulesRegistry( |
| 2420 rules_registry_id, | 2420 rules_registry_id, |
| 2421 extensions::declarative_webrequest_constants::kOnRequest).get(); | 2421 extensions::declarative_webrequest_constants::kOnRequest).get(); |
| 2422 | 2422 |
| 2423 EXPECT_TRUE(registry); | 2423 EXPECT_TRUE(registry); |
| 2424 EXPECT_FALSE(registry->rules_cache_delegate_for_testing()); | 2424 EXPECT_FALSE(registry->rules_cache_delegate_for_testing()); |
| 2425 } | 2425 } |
| 2426 | 2426 |
| 2427 // This test verify that the set of rules registries of a webview will be | |
|
Charlie Reis
2014/12/18 00:27:40
nit: verifies
Fady Samuel
2014/12/18 00:35:50
Done.
| |
| 2428 // removed from RulesRegistryService after the webview is gone. | |
| 2429 // http://crbug.com/438327 | |
|
Charlie Reis
2014/12/18 00:27:40
This is a different bug number. Is it a related b
Fady Samuel
2014/12/18 00:35:50
Doh. Blind copy and paste. Fixed.
| |
| 2430 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestWebViewInsideFrame) { | |
| 2431 LoadAppWithGuest("web_view/inside_iframe"); | |
|
Charlie Reis
2014/12/18 00:27:39
Does this file need to be added?
Fady Samuel
2014/12/18 00:35:50
Yes.
| |
| 2432 } | |
| 2433 | |
| 2427 // <webview> screenshot capture fails with ubercomp. | 2434 // <webview> screenshot capture fails with ubercomp. |
| 2428 // See http://crbug.com/327035. | 2435 // See http://crbug.com/327035. |
| 2429 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2436 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
| 2430 DISABLED_Shim_ScreenshotCapture) { | 2437 DISABLED_Shim_ScreenshotCapture) { |
| 2431 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2438 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
| 2432 } | 2439 } |
| 2433 | 2440 |
| 2434 #if defined(OS_WIN) | 2441 #if defined(OS_WIN) |
| 2435 // Test is disabled on Windows because it times out often. | 2442 // Test is disabled on Windows because it times out often. |
| 2436 // http://crbug.com/403325 | 2443 // http://crbug.com/403325 |
| 2437 #define MAYBE_WebViewInBackgroundPage \ | 2444 #define MAYBE_WebViewInBackgroundPage \ |
| 2438 DISABLED_WebViewInBackgroundPage | 2445 DISABLED_WebViewInBackgroundPage |
| 2439 #else | 2446 #else |
| 2440 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2447 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2441 #endif | 2448 #endif |
| 2442 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2449 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2443 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2450 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2444 << message_; | 2451 << message_; |
| 2445 } | 2452 } |
| OLD | NEW |