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 <queue> | 5 #include <queue> |
6 | 6 |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/process/process.h" | 9 #include "base/process/process.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
346 content::WebContentsDelegate* orig_delegate_; | 346 content::WebContentsDelegate* orig_delegate_; |
347 bool waiting_for_decision_; | 347 bool waiting_for_decision_; |
348 bool expect_allow_; | 348 bool expect_allow_; |
349 bool decision_made_; | 349 bool decision_made_; |
350 bool last_download_allowed_; | 350 bool last_download_allowed_; |
351 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; | 351 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; |
352 | 352 |
353 DISALLOW_COPY_AND_ASSIGN(MockDownloadWebContentsDelegate); | 353 DISALLOW_COPY_AND_ASSIGN(MockDownloadWebContentsDelegate); |
354 }; | 354 }; |
355 | 355 |
356 // TODO(wjmaclean): Fix this test class at some point so it can be re-enabled on | |
357 // the site isolation bots, and then look at re-enabling WebViewFocusTest when | |
358 // that happens. | |
Nico
2015/06/23 18:16:13
please file a tracking bug for this, and reference
| |
356 class WebViewTest : public extensions::PlatformAppBrowserTest { | 359 class WebViewTest : public extensions::PlatformAppBrowserTest { |
357 protected: | 360 protected: |
358 void SetUp() override { | 361 void SetUp() override { |
359 if (UsesFakeSpeech()) { | 362 if (UsesFakeSpeech()) { |
360 // SpeechRecognition test specific SetUp. | 363 // SpeechRecognition test specific SetUp. |
361 fake_speech_recognition_manager_.reset( | 364 fake_speech_recognition_manager_.reset( |
362 new content::FakeSpeechRecognitionManager()); | 365 new content::FakeSpeechRecognitionManager()); |
363 fake_speech_recognition_manager_->set_should_send_fake_response(true); | 366 fake_speech_recognition_manager_->set_should_send_fake_response(true); |
364 // Inject the fake manager factory so that the test result is returned to | 367 // Inject the fake manager factory so that the test result is returned to |
365 // the web page. | 368 // the web page. |
(...skipping 2031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2397 << message_; | 2400 << message_; |
2398 } | 2401 } |
2399 | 2402 |
2400 // Tests that webviews do get garbage collected. | 2403 // Tests that webviews do get garbage collected. |
2401 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGarbageCollect) { | 2404 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGarbageCollect) { |
2402 TestHelper("testGarbageCollect", "web_view/shim", NO_TEST_SERVER); | 2405 TestHelper("testGarbageCollect", "web_view/shim", NO_TEST_SERVER); |
2403 GetGuestViewManager()->WaitForSingleViewGarbageCollected(); | 2406 GetGuestViewManager()->WaitForSingleViewGarbageCollected(); |
2404 } | 2407 } |
2405 | 2408 |
2406 #if defined(USE_AURA) | 2409 #if defined(USE_AURA) |
2410 // TODO(wjmaclean): when WebViewTest is re-enabled on the site-isolation | |
2411 // bots, then re-enable this test class as well. | |
2407 class WebViewFocusTest : public WebViewTest { | 2412 class WebViewFocusTest : public WebViewTest { |
2408 public: | 2413 public: |
2409 ~WebViewFocusTest() override {} | 2414 ~WebViewFocusTest() override {} |
2410 | 2415 |
2411 void SetUpCommandLine(base::CommandLine* command_line) override { | 2416 void SetUpCommandLine(base::CommandLine* command_line) override { |
2412 WebViewTest::SetUpCommandLine(command_line); | 2417 WebViewTest::SetUpCommandLine(command_line); |
2413 | 2418 |
2414 command_line->AppendSwitchASCII(switches::kTouchEvents, | 2419 command_line->AppendSwitchASCII(switches::kTouchEvents, |
2415 switches::kTouchEventsEnabled); | 2420 switches::kTouchEventsEnabled); |
2416 } | 2421 } |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2524 // TODO(wjmaclean): This is fragile ... if anyone alters the location/size | 2529 // TODO(wjmaclean): This is fragile ... if anyone alters the location/size |
2525 // of the webview in accept_touch_events then this may miss its target. | 2530 // of the webview in accept_touch_events then this may miss its target. |
2526 FocusWaiter waiter(aura_webview); | 2531 FocusWaiter waiter(aura_webview); |
2527 content::SimulateTouchPressAt(GetEmbedderWebContents(), gfx::Point(10, 10)); | 2532 content::SimulateTouchPressAt(GetEmbedderWebContents(), gfx::Point(10, 10)); |
2528 | 2533 |
2529 // Wait for the TouchStart to propagate and restore focus. Test times out | 2534 // Wait for the TouchStart to propagate and restore focus. Test times out |
2530 // on failure. | 2535 // on failure. |
2531 waiter.Wait(); | 2536 waiter.Wait(); |
2532 } | 2537 } |
2533 #endif | 2538 #endif |
OLD | NEW |