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

chrome/browser/android/offline_pages/prerendering_loader_unittest.cc

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 929d78b1a91068000fc62a22fead9fa1050cd0f5..3036d9d69bd43cd0b268f527adcae58649b1a0a0 100644
--- a/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
@@ -168,7 +168,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadSucceededFromDomContentLoaded) {
   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.
@@ -193,7 +194,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadSucceededFromPrerenderStopLoading) {
   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());
@@ -224,7 +226,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedNoContent) {
   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());
 
@@ -247,7 +250,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedNoRetry) {
   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());
 
@@ -272,7 +276,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedNoNext) {
   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());
 
@@ -297,7 +302,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadCanceled) {
   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());
 
@@ -319,7 +325,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadFailedUnsupportedScheme) {
   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());
 
@@ -341,7 +348,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageLoadCanceledFromStopLoading) {
   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());
 
@@ -356,14 +364,16 @@ TEST_F(PrerenderingLoaderTest, LoadPageNotAcceptedWhenNotIdle) {
   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());
 }
 
@@ -373,7 +383,8 @@ TEST_F(PrerenderingLoaderTest, LoadPageNotAcceptedWhenStartPrerenderFalse) {
   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());
 }