| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/macros.h" | 5 #include "base/macros.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti
l.h" | 10 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti
l.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 | 214 |
| 215 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, | 215 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, |
| 216 ContentScriptIsInjectedAfterTerminateAndReloadWebView) { | 216 ContentScriptIsInjectedAfterTerminateAndReloadWebView) { |
| 217 ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL()); | 217 ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL()); |
| 218 | 218 |
| 219 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( | 219 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( |
| 220 "testContentScriptIsInjectedAfterTerminateAndReloadWebView", | 220 "testContentScriptIsInjectedAfterTerminateAndReloadWebView", |
| 221 new base::StringValue(GetTestUrl("empty.html").spec()))); | 221 new base::StringValue(GetTestUrl("empty.html").spec()))); |
| 222 } | 222 } |
| 223 | 223 |
| 224 // TODO(crbug.com/662673) Flaky on CrOS trybots. |
| 225 #if defined(OS_CHROMEOS) |
| 226 #define MAYBE_ContentScriptExistsAsLongAsWebViewTagExists \ |
| 227 DISABLED_ContentScriptExistsAsLongAsWebViewTagExists |
| 228 #else |
| 229 #define MAYBE_ContentScriptExistsAsLongAsWebViewTagExists \ |
| 230 ContentScriptExistsAsLongAsWebViewTagExists |
| 231 #endif |
| 224 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, | 232 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, |
| 225 ContentScriptExistsAsLongAsWebViewTagExists) { | 233 MAYBE_ContentScriptExistsAsLongAsWebViewTagExists) { |
| 226 ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL()); | 234 ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL()); |
| 227 | 235 |
| 228 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( | 236 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( |
| 229 "testContentScriptExistsAsLongAsWebViewTagExists", | 237 "testContentScriptExistsAsLongAsWebViewTagExists", |
| 230 new base::StringValue(GetTestUrl("empty.html").spec()))); | 238 new base::StringValue(GetTestUrl("empty.html").spec()))); |
| 231 } | 239 } |
| 232 | 240 |
| 233 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddContentScriptWithCode) { | 241 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddContentScriptWithCode) { |
| 234 ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL()); | 242 ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL()); |
| 235 | 243 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 render_view_host->DragTargetDrop(dropdata, client_pt, screen_pt, 0); | 358 render_view_host->DragTargetDrop(dropdata, client_pt, screen_pt, 0); |
| 351 ASSERT_TRUE(listener.Wait()); | 359 ASSERT_TRUE(listener.Wait()); |
| 352 // Confirm no navigation | 360 // Confirm no navigation |
| 353 EXPECT_FALSE(observer.Navigated()); | 361 EXPECT_FALSE(observer.Navigated()); |
| 354 EXPECT_EQ(GetWebViewEnabledWebUIURL(), embedder_web_contents->GetURL()); | 362 EXPECT_EQ(GetWebViewEnabledWebUIURL(), embedder_web_contents->GetURL()); |
| 355 } | 363 } |
| 356 } | 364 } |
| 357 #endif | 365 #endif |
| 358 | 366 |
| 359 #endif // !defined(OS_MACOSX) | 367 #endif // !defined(OS_MACOSX) |
| OLD | NEW |