[Offline pages] Update background loader to override the WebContentsObserver methods expected

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 129 matching lines @@
   }
   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 PumpLoop() { base::RunLoop().RunUntilIdle(); }
+
   void CompleteLoading() {
-    // For some reason, setting loading to True will call DidStopLoading
-    // on the observers.
-    offliner()->web_contents_tester()->TestSetIsLoading(true);
+    offliner()->DocumentOnLoadCompletedInMainFrame();
+    PumpLoop();
   }
 
-  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_;
@@ skipping 258 matching lines @@
   std::unique_ptr<content::NavigationHandle> handle(
       content::NavigationHandle::CreateNavigationHandleForTesting(
           kHttpUrl, offliner()->web_contents()->GetMainFrame(), true,
           net::Error::ERR_NAME_NOT_RESOLVED));
   // NavigationHandle destruction will trigger DidFinishNavigation code.
   handle.reset();
   histograms().ExpectBucketCount(
       "OfflinePages.Background.BackgroundLoadingFailedCode.async_loading",
       105,  // ERR_NAME_NOT_RESOLVED
       1);
-  offliner()->DidStopLoading();
+  CompleteLoading();
   PumpLoop();
 
   EXPECT_TRUE(completion_callback_called());
   EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED_NO_RETRY, request_status());
 }
 
 TEST_F(BackgroundLoaderOfflinerTest, NoNextOnInternetDisconnected) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
 
   // Create handle with net error code.
   // Called after calling LoadAndSave so we have web_contents to work with.
   std::unique_ptr<content::NavigationHandle> handle(
       content::NavigationHandle::CreateNavigationHandleForTesting(
           kHttpUrl, offliner()->web_contents()->GetMainFrame(), true,
           net::Error::ERR_INTERNET_DISCONNECTED));
   // Call DidFinishNavigation with handle that contains error.
   offliner()->DidFinishNavigation(handle.get());
   // NavigationHandle is always destroyed after finishing navigation.
   handle.reset();
-  offliner()->DidStopLoading();
+  CompleteLoading();
   PumpLoop();
 
   EXPECT_TRUE(completion_callback_called());
   EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED_NO_NEXT, request_status());
 }
 
 TEST_F(BackgroundLoaderOfflinerTest, OnlySavesOnceOnMultipleLoads) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   // First load
   CompleteLoading();
   // Second load
-  offliner()->DidStopLoading();
+  CompleteLoading();
   PumpLoop();
   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