[Offline Pages] Make prerenderer notify us of network progress.

chrome/browser/android/offline_pages/prerendering_loader_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/offline_pages/prerendering_loader.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
@@ skipping 150 matching lines @@
 
 TEST_F(PrerenderingLoaderTest, LoadPageLoadSucceededFromDomContentLoaded) {
   test_adapter()->Configure(
       content::WebContentsTester::CreateTestWebContents(profile(), NULL),
       prerender::FINAL_STATUS_USED);
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));

[Pete Williamson, 2017/02/22 18:46:30]

What does this line do?  Is this a "do-nothing" lambda in C++ 11/14?  Are we
allowing those in the code yet?

[Dmitry Titov, 2017/02/23 04:27:54]

Yep, lambda. 
https://cs.chromium.org/search/?q=Bind%5C(%5C%5B%5C%5D&type=cs
Also, https://chromium-cpp.appspot.com/ says they are allowed.

[pasko, 2017/02/24 15:10:28]

Interestingly, Bind allows capture-less lambda, but should reject others:

https://groups.google.com/a/chromium.org/forum/#!topic/cxx/QxjsPELDYdQ

 
   test_adapter()->GetObserver()->OnPrerenderDomContentLoaded();
   // Skip SnapshotController's wait time and emulate StartSnapshot call.
   loader()->StartSnapshot();
   PumpLoop();
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_TRUE(loader()->IsLoaded());
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(Offliner::RequestStatus::LOADED, callback_load_status());
 
   loader()->StopLoading();
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageLoadSucceededFromPrerenderStopLoading) {
   test_adapter()->Configure(
       content::WebContentsTester::CreateTestWebContents(profile(), NULL),
       prerender::FINAL_STATUS_USED);
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
 
   PumpLoop();
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   test_adapter()->GetObserver()->OnPrerenderStopLoading();
   // Skip SnapshotController's wait time and emulate StartSnapshot call.
   loader()->StartSnapshot();
   PumpLoop();
   EXPECT_FALSE(loader()->IsIdle());
@@ skipping 10 matching lines @@
   EXPECT_FALSE(test_adapter()->IsActive());
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedNoContent) {
   test_adapter()->Configure(nullptr /* web_contents */,
                             prerender::FINAL_STATUS_CACHE_OR_HISTORY_CLEARED);
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   test_adapter()->GetObserver()->OnPrerenderDomContentLoaded();
   PumpLoop();
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(callback_called());
   // We did not provide any WebContents for the callback so expect did not load.
   EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED, callback_load_status());
 
   // Stopped event causes no harm.
   test_adapter()->GetObserver()->OnPrerenderStop();
   PumpLoop();
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedNoRetry) {
   test_adapter()->Configure(nullptr /* web_contents */,
                             prerender::FINAL_STATUS_SAFE_BROWSING);
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   test_adapter()->GetObserver()->OnPrerenderDomContentLoaded();
   PumpLoop();
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(callback_called());
   // We did not provide any WebContents for the callback so expect did not load.
   // FinalStatus is non-retryable failure.
   EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED_NO_RETRY,
             callback_load_status());
 
   // Stopped event causes no harm.
   test_adapter()->GetObserver()->OnPrerenderStop();
   PumpLoop();
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedNoNext) {
   test_adapter()->Configure(nullptr /* web_contents */,
                             prerender::FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   test_adapter()->GetObserver()->OnPrerenderDomContentLoaded();
   PumpLoop();
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(callback_called());
   // We did not provide any WebContents for the callback so expect did not load.
   // FinalStatus is non-next failure.
   EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED_NO_NEXT,
             callback_load_status());
 
   // Stopped event causes no harm.
   test_adapter()->GetObserver()->OnPrerenderStop();
   PumpLoop();
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageLoadCanceled) {
   test_adapter()->Configure(nullptr /* web_contents */,
                             prerender::FINAL_STATUS_CANCELLED);
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   test_adapter()->GetObserver()->OnPrerenderDomContentLoaded();
   PumpLoop();
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(Offliner::RequestStatus::LOADING_CANCELED, callback_load_status());
 
   // Stopped event causes no harm.
   test_adapter()->GetObserver()->OnPrerenderStop();
   PumpLoop();
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedUnsupportedScheme) {
   test_adapter()->Configure(nullptr /* web_contents */,
                             prerender::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))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   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::LOADING_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());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   loader()->StopLoading();
   PumpLoop();
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_FALSE(callback_called());
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageNotAcceptedWhenNotIdle) {
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   // Now try another load while first is still active.
   EXPECT_FALSE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
 }
 
 TEST_F(PrerenderingLoaderTest, LoadPageNotAcceptedWhenStartPrerenderFalse) {
   test_adapter()->FailStart();
   GURL gurl("http://testit.sea");
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_FALSE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_TRUE(loader()->IsIdle());
 }
 
 }  // namespace offline_pages