| 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 "components/dom_distiller/content/browser/distiller_page_web_contents.h
" | 5 #include "components/dom_distiller/content/browser/distiller_page_web_contents.h
" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 bool expect_new_web_contents = true; | 308 bool expect_new_web_contents = true; |
| 309 bool setup_main_frame_observer = false; | 309 bool setup_main_frame_observer = false; |
| 310 bool wait_for_document_loaded = true; | 310 bool wait_for_document_loaded = true; |
| 311 RunUseCurrentWebContentsTest(url, | 311 RunUseCurrentWebContentsTest(url, |
| 312 expect_new_web_contents, | 312 expect_new_web_contents, |
| 313 setup_main_frame_observer, | 313 setup_main_frame_observer, |
| 314 wait_for_document_loaded); | 314 wait_for_document_loaded); |
| 315 } | 315 } |
| 316 | 316 |
| 317 IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, | 317 IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, |
| 318 UsingCurrentWebContentsNotFinishedLoadingYet) { | 318 DISABLED_UsingCurrentWebContentsNotFinishedLoadingYet) { |
| 319 std::string url(kSimpleArticlePath); | 319 std::string url(kSimpleArticlePath); |
| 320 bool expect_new_web_contents = false; | 320 bool expect_new_web_contents = false; |
| 321 bool setup_main_frame_observer = true; | 321 bool setup_main_frame_observer = true; |
| 322 bool wait_for_document_loaded = false; | 322 bool wait_for_document_loaded = false; |
| 323 RunUseCurrentWebContentsTest(url, | 323 RunUseCurrentWebContentsTest(url, |
| 324 expect_new_web_contents, | 324 expect_new_web_contents, |
| 325 setup_main_frame_observer, | 325 setup_main_frame_observer, |
| 326 wait_for_document_loaded); | 326 wait_for_document_loaded); |
| 327 } | 327 } |
| 328 | 328 |
| 329 IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, | 329 IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, |
| 330 UsingCurrentWebContentsReadyForDistillation) { | 330 DISABLED_UsingCurrentWebContentsReadyForDistillation) { |
| 331 std::string url(kSimpleArticlePath); | 331 std::string url(kSimpleArticlePath); |
| 332 bool expect_new_web_contents = false; | 332 bool expect_new_web_contents = false; |
| 333 bool setup_main_frame_observer = true; | 333 bool setup_main_frame_observer = true; |
| 334 bool wait_for_document_loaded = true; | 334 bool wait_for_document_loaded = true; |
| 335 RunUseCurrentWebContentsTest(url, | 335 RunUseCurrentWebContentsTest(url, |
| 336 expect_new_web_contents, | 336 expect_new_web_contents, |
| 337 setup_main_frame_observer, | 337 setup_main_frame_observer, |
| 338 wait_for_document_loaded); | 338 wait_for_document_loaded); |
| 339 } | 339 } |
| 340 | 340 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 ASSERT_TRUE(js_result_); | 520 ASSERT_TRUE(js_result_); |
| 521 ASSERT_TRUE(js_result_->GetAsDictionary(&dict)); | 521 ASSERT_TRUE(js_result_->GetAsDictionary(&dict)); |
| 522 | 522 |
| 523 ASSERT_TRUE(dict->HasKey("success")); | 523 ASSERT_TRUE(dict->HasKey("success")); |
| 524 bool success; | 524 bool success; |
| 525 ASSERT_TRUE(dict->GetBoolean("success", &success)); | 525 ASSERT_TRUE(dict->GetBoolean("success", &success)); |
| 526 EXPECT_TRUE(success); | 526 EXPECT_TRUE(success); |
| 527 } | 527 } |
| 528 | 528 |
| 529 } // namespace dom_distiller | 529 } // namespace dom_distiller |
| OLD | NEW |