| 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 907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 918 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAPIMethodExistence) { | 918 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAPIMethodExistence) { |
| 919 TestHelper("testAPIMethodExistence", "web_view/shim", NO_TEST_SERVER); | 919 TestHelper("testAPIMethodExistence", "web_view/shim", NO_TEST_SERVER); |
| 920 } | 920 } |
| 921 | 921 |
| 922 // Tests the existence of WebRequest API event objects on the request | 922 // Tests the existence of WebRequest API event objects on the request |
| 923 // object, on the webview element, and hanging directly off webview. | 923 // object, on the webview element, and hanging directly off webview. |
| 924 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestWebRequestAPIExistence) { | 924 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestWebRequestAPIExistence) { |
| 925 TestHelper("testWebRequestAPIExistence", "web_view/shim", NO_TEST_SERVER); | 925 TestHelper("testWebRequestAPIExistence", "web_view/shim", NO_TEST_SERVER); |
| 926 } | 926 } |
| 927 | 927 |
| 928 // Tests the existence of DeclarativeContent API event objects on the request | |
| 929 // object, on the webview element, and hanging directly off webview. | |
| 930 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestDeclarativeContentAPIExistence) { | |
| 931 TestHelper("testDeclarativeContentAPIExistence", | |
| 932 "web_view/shim", | |
| 933 NO_TEST_SERVER); | |
| 934 } | |
| 935 | |
| 936 // http://crbug.com/315920 | 928 // http://crbug.com/315920 |
| 937 #if defined(GOOGLE_CHROME_BUILD) && (defined(OS_WIN) || defined(OS_LINUX)) | 929 #if defined(GOOGLE_CHROME_BUILD) && (defined(OS_WIN) || defined(OS_LINUX)) |
| 938 #define MAYBE_Shim_TestChromeExtensionURL DISABLED_Shim_TestChromeExtensionURL | 930 #define MAYBE_Shim_TestChromeExtensionURL DISABLED_Shim_TestChromeExtensionURL |
| 939 #else | 931 #else |
| 940 #define MAYBE_Shim_TestChromeExtensionURL Shim_TestChromeExtensionURL | 932 #define MAYBE_Shim_TestChromeExtensionURL Shim_TestChromeExtensionURL |
| 941 #endif | 933 #endif |
| 942 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Shim_TestChromeExtensionURL) { | 934 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Shim_TestChromeExtensionURL) { |
| 943 TestHelper("testChromeExtensionURL", "web_view/shim", NO_TEST_SERVER); | 935 TestHelper("testChromeExtensionURL", "web_view/shim", NO_TEST_SERVER); |
| 944 } | 936 } |
| 945 | 937 |
| (...skipping 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2556 // http://crbug.com/403325 | 2548 // http://crbug.com/403325 |
| 2557 #define MAYBE_WebViewInBackgroundPage \ | 2549 #define MAYBE_WebViewInBackgroundPage \ |
| 2558 DISABLED_WebViewInBackgroundPage | 2550 DISABLED_WebViewInBackgroundPage |
| 2559 #else | 2551 #else |
| 2560 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2552 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2561 #endif | 2553 #endif |
| 2562 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2554 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2563 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2555 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2564 << message_; | 2556 << message_; |
| 2565 } | 2557 } |
| OLD | NEW |