| 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/process/process.h" | 6 #include "base/process/process.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
| (...skipping 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2342 if (base::win::GetVersion() <= base::win::VERSION_XP) | 2342 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 2343 return; | 2343 return; |
| 2344 #endif | 2344 #endif |
| 2345 | 2345 |
| 2346 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 2346 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 2347 ASSERT_TRUE(RunPlatformAppTestWithArg( | 2347 ASSERT_TRUE(RunPlatformAppTestWithArg( |
| 2348 "platform_apps/web_view/common", "cleardata")) | 2348 "platform_apps/web_view/common", "cleardata")) |
| 2349 << message_; | 2349 << message_; |
| 2350 } | 2350 } |
| 2351 | 2351 |
| 2352 IN_PROC_BROWSER_TEST_F(WebViewTest, ClearDataCache) { | 2352 #if defined(OS_WIN) |
| 2353 // Test is disabled on Windows because it fails often (~9% time) |
| 2354 // http://crbug.com/489088 |
| 2355 #define MAYBE_ClearDataCache DISABLED_ClearDataCache |
| 2356 #else |
| 2357 #define MAYBE_ClearDataCache ClearDataCache |
| 2358 #endif |
| 2359 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_ClearDataCache) { |
| 2353 TestHelper("testClearCache", "web_view/clear_data_cache", NEEDS_TEST_SERVER); | 2360 TestHelper("testClearCache", "web_view/clear_data_cache", NEEDS_TEST_SERVER); |
| 2354 } | 2361 } |
| 2355 | 2362 |
| 2356 IN_PROC_BROWSER_TEST_F(WebViewTest, ConsoleMessage) { | 2363 IN_PROC_BROWSER_TEST_F(WebViewTest, ConsoleMessage) { |
| 2357 ASSERT_TRUE(RunPlatformAppTestWithArg( | 2364 ASSERT_TRUE(RunPlatformAppTestWithArg( |
| 2358 "platform_apps/web_view/common", "console_messages")) | 2365 "platform_apps/web_view/common", "console_messages")) |
| 2359 << message_; | 2366 << message_; |
| 2360 } | 2367 } |
| 2361 | 2368 |
| 2362 IN_PROC_BROWSER_TEST_F(WebViewTest, DownloadPermission) { | 2369 IN_PROC_BROWSER_TEST_F(WebViewTest, DownloadPermission) { |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2704 // This test verifies that the allowtransparency attribute properly propagates | 2711 // This test verifies that the allowtransparency attribute properly propagates |
| 2705 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { | 2712 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { |
| 2706 LoadAppWithGuest("web_view/simple"); | 2713 LoadAppWithGuest("web_view/simple"); |
| 2707 | 2714 |
| 2708 ASSERT_TRUE(GetGuestWebContents()); | 2715 ASSERT_TRUE(GetGuestWebContents()); |
| 2709 extensions::WebViewGuest* guest = | 2716 extensions::WebViewGuest* guest = |
| 2710 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); | 2717 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); |
| 2711 ASSERT_TRUE(guest->allow_transparency()); | 2718 ASSERT_TRUE(guest->allow_transparency()); |
| 2712 ASSERT_TRUE(guest->allow_scaling()); | 2719 ASSERT_TRUE(guest->allow_scaling()); |
| 2713 } | 2720 } |
| OLD | NEW |