Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: chrome/browser/android/offline_pages/prerendering_loader_unittest.cc

Issue 2294933003: [Offline Pages] Handle prerender FinalStatus UnsupportedScheme as a cancel rather than failure. (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
diff --git a/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc b/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
index f662f12306903d6d9095d19b77ba942f732af2f0..d90a2183d2761736a9c9077d156c746bc5e5156b 100644
--- a/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
@@ -147,6 +147,7 @@ void PrerenderingLoaderTest::SetUp() {
loader_.reset(new PrerenderingLoader(&profile_));
test_adapter_ = new TestAdapter(loader_.get());
loader_->SetAdapterForTesting(base::WrapUnique(test_adapter_));
+ callback_called_ = false;
Pete Williamson 2016/08/30 20:42:47 Nice catch!
dougarnett 2016/08/31 16:10:52 Acknowledged.
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
}
@@ -252,6 +253,32 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedNoContent) {
PumpLoop();
}
+TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedUnsupportedScheme) {
+ test_adapter()->Configure(
+ nullptr /* web_contents */,
+ prerender::FinalStatus::FINAL_STATUS_UNSUPPORTED_SCHEME);
+ GURL gurl("http://testit.sea");
+ EXPECT_TRUE(loader()->IsIdle());
+ EXPECT_TRUE(loader()->LoadPage(
+ gurl,
+ base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+ EXPECT_FALSE(loader()->IsIdle());
+ EXPECT_FALSE(loader()->IsLoaded());
+
+ test_adapter()->GetObserver()->OnPrerenderDomContentLoaded();
+ PumpLoop();
+ EXPECT_TRUE(loader()->IsIdle());
+ EXPECT_TRUE(callback_called());
+ // Unsupported Scheme final status currently considered a cancel rather
+ // than failure in case it is due to lost network connectivity.
+ EXPECT_EQ(Offliner::RequestStatus::PRERENDERING_CANCELED,
+ callback_load_status());
+
+ // Stopped event causes no harm.
+ test_adapter()->GetObserver()->OnPrerenderStop();
+ PumpLoop();
+}
+
TEST_F(PrerenderingLoaderTest, LoadPageLoadCanceledFromStopLoading) {
GURL gurl("http://testit.sea");
EXPECT_TRUE(loader()->IsIdle());

Powered by Google App Engine
This is Rietveld 408576698