[Offline Pages] Allow BackgroundLoader to track network bytes using prerenderer hook-in.

chrome/browser/android/offline_pages/background_loader_offliner_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/background_loader_offliner.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/scoped_mock_time_message_loop_task_runner.h"
@@ skipping 127 matching lines @@
     return base::Bind(&BackgroundLoaderOfflinerTest::OnCancel,
                       base::Unretained(this));
   }
   Profile* profile() { return &profile_; }
   bool completion_callback_called() { return completion_callback_called_; }
   Offliner::RequestStatus request_status() { return request_status_; }
   bool cancel_callback_called() { return cancel_callback_called_; }
   bool SaveInProgress() const { return model_->mock_saving(); }
   MockOfflinePageModel* model() const { return model_; }
   const base::HistogramTester& histograms() const { return histogram_tester_; }
+  int64_t progress() { return progress_; }
 
   void CompleteLoading() {
     // For some reason, setting loading to True will call DidStopLoading
     // on the observers.
     offliner()->web_contents_tester()->TestSetIsLoading(true);
   }
 
   void PumpLoop() { base::RunLoop().RunUntilIdle(); }
 
  private:
   void OnCompletion(const SavePageRequest& request,
                     Offliner::RequestStatus status);
   void OnProgress(const SavePageRequest& request, int64_t bytes);
   void OnCancel(int64_t offline_id);
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
   std::unique_ptr<TestBackgroundLoaderOffliner> offliner_;
   MockOfflinePageModel* model_;
   bool completion_callback_called_;
   bool cancel_callback_called_;
+  int64_t progress_;
   Offliner::RequestStatus request_status_;
   base::HistogramTester histogram_tester_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundLoaderOfflinerTest);
 };
 
 BackgroundLoaderOfflinerTest::BackgroundLoaderOfflinerTest()
     : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
       completion_callback_called_(false),
       cancel_callback_called_(false),
+      progress_(0LL),
       request_status_(Offliner::RequestStatus::UNKNOWN) {}
 
 BackgroundLoaderOfflinerTest::~BackgroundLoaderOfflinerTest() {}
 
 void BackgroundLoaderOfflinerTest::SetUp() {
   model_ = new MockOfflinePageModel();
   offliner_.reset(new TestBackgroundLoaderOffliner(profile(), nullptr, model_));
   offliner_->SetPageDelayForTest(0L);
 }
 
 void BackgroundLoaderOfflinerTest::OnCompletion(
     const SavePageRequest& request,
     Offliner::RequestStatus status) {
   DCHECK(!completion_callback_called_);  // Expect 1 callback per request.
   completion_callback_called_ = true;
   request_status_ = status;
 }
 
 void BackgroundLoaderOfflinerTest::OnProgress(const SavePageRequest& request,
-                                              int64_t bytes) {}
+                                              int64_t bytes) {
+  progress_ = bytes;
+}
+
 void BackgroundLoaderOfflinerTest::OnCancel(int64_t offline_id) {
   DCHECK(!cancel_callback_called_);
   cancel_callback_called_ = true;
 }
 
 TEST_F(BackgroundLoaderOfflinerTest,
        LoadAndSaveBlockThirdPartyCookiesForCustomTabs) {
   base::Time creation_time = base::Time::Now();
   ClientId custom_tabs_client_id("custom_tabs", "88");
   SavePageRequest request(kRequestId, kHttpUrl, custom_tabs_client_id,
@@ skipping 40 matching lines @@
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   EXPECT_TRUE(offliner()->is_loading());
   EXPECT_FALSE(SaveInProgress());
   EXPECT_FALSE(completion_callback_called());
   EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
 }
 
+TEST_F(BackgroundLoaderOfflinerTest, BytesReportedWillUpdateProgress) {
+  base::Time creation_time = base::Time::Now();
+  SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
+                          kUserRequested);
+  EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+                                      progress_callback()));
+  offliner()->OnNetworkBytesChanged(5LL);
+  EXPECT_EQ(progress(), 5LL);
+  offliner()->OnNetworkBytesChanged(10LL);
+  EXPECT_EQ(progress(), 15LL);
+}
+
 TEST_F(BackgroundLoaderOfflinerTest, CompleteLoadingInitiatesSave) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   CompleteLoading();
   PumpLoop();
   EXPECT_FALSE(completion_callback_called());
   EXPECT_TRUE(SaveInProgress());
   EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
 }
 
 TEST_F(BackgroundLoaderOfflinerTest, CancelWhenLoading) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   offliner()->Cancel(cancel_callback());
   PumpLoop();
+  offliner()->OnNetworkBytesChanged(15LL);
   EXPECT_TRUE(cancel_callback_called());
   EXPECT_FALSE(offliner()->is_loading());  // Offliner reset.
+  EXPECT_EQ(progress(), 0LL);  // network bytes not recorded when not busy.
 }
 
 TEST_F(BackgroundLoaderOfflinerTest, CancelWhenLoaded) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   CompleteLoading();
   PumpLoop();
@@ skipping 20 matching lines @@
   PumpLoop();
   model()->CompleteSavingAsArchiveCreationFailed();
   PumpLoop();
 
   EXPECT_TRUE(completion_callback_called());
   EXPECT_EQ(Offliner::RequestStatus::SAVE_FAILED, request_status());
   EXPECT_FALSE(offliner()->is_loading());
   EXPECT_FALSE(SaveInProgress());
 }
 
+TEST_F(BackgroundLoaderOfflinerTest, ProgressDoesNotUpdateDuringSave) {
+  base::Time creation_time = base::Time::Now();
+  SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
+                          kUserRequested);
+  EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+                                      progress_callback()));
+  offliner()->OnNetworkBytesChanged(10LL);
+  CompleteLoading();
+  PumpLoop();
+  offliner()->OnNetworkBytesChanged(15LL);
+  EXPECT_EQ(progress(), 10LL);
+}
+
 TEST_F(BackgroundLoaderOfflinerTest, LoadAndSaveSuccess) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
 
   CompleteLoading();
   PumpLoop();
   model()->CompleteSavingAsSuccess();
@@ skipping 89 matching lines @@
   model()->CompleteSavingAsSuccess();
   PumpLoop();
 
   EXPECT_TRUE(completion_callback_called());
   EXPECT_EQ(Offliner::RequestStatus::SAVED, request_status());
   EXPECT_FALSE(offliner()->is_loading());
   EXPECT_FALSE(SaveInProgress());
 }
 
 }  // namespace offline_pages