| 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/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/chrome_content_browser_client.h" | 10 #include "chrome/browser/chrome_content_browser_client.h" |
| (...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 996 NO_TEST_SERVER); | 996 NO_TEST_SERVER); |
| 997 } | 997 } |
| 998 | 998 |
| 999 IN_PROC_BROWSER_TEST_F(WebViewTest, | 999 IN_PROC_BROWSER_TEST_F(WebViewTest, |
| 1000 Shim_TestPartitionRemovalAfterNavigationFails) { | 1000 Shim_TestPartitionRemovalAfterNavigationFails) { |
| 1001 TestHelper("testPartitionRemovalAfterNavigationFails", | 1001 TestHelper("testPartitionRemovalAfterNavigationFails", |
| 1002 "web_view/shim", | 1002 "web_view/shim", |
| 1003 NO_TEST_SERVER); | 1003 NO_TEST_SERVER); |
| 1004 } | 1004 } |
| 1005 | 1005 |
| 1006 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAddAndRemoveContentScripts) { |
| 1007 TestHelper("testAddAndRemoveContentScripts", |
| 1008 "web_view/shim", |
| 1009 NEEDS_TEST_SERVER); |
| 1010 } |
| 1011 |
| 1006 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { | 1012 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { |
| 1007 #if defined(OS_WIN) | 1013 #if defined(OS_WIN) |
| 1008 // Flaky on XP bot http://crbug.com/266185 | 1014 // Flaky on XP bot http://crbug.com/266185 |
| 1009 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1015 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1010 return; | 1016 return; |
| 1011 #endif | 1017 #endif |
| 1012 | 1018 |
| 1013 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); | 1019 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); |
| 1014 } | 1020 } |
| 1015 | 1021 |
| (...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2548 // http://crbug.com/403325 | 2554 // http://crbug.com/403325 |
| 2549 #define MAYBE_WebViewInBackgroundPage \ | 2555 #define MAYBE_WebViewInBackgroundPage \ |
| 2550 DISABLED_WebViewInBackgroundPage | 2556 DISABLED_WebViewInBackgroundPage |
| 2551 #else | 2557 #else |
| 2552 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2558 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2553 #endif | 2559 #endif |
| 2554 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2560 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2555 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2561 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2556 << message_; | 2562 << message_; |
| 2557 } | 2563 } |
| OLD | NEW |