[Offline pages] Stop observing web contents and reset to null after use. Only create a new web cont…

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_feature_list.h"
@@ skipping 96 matching lines @@
       content::BrowserContext* browser_context,
       const OfflinerPolicy* policy,
       OfflinePageModel* offline_page_model);
   ~TestBackgroundLoaderOffliner() override;
   content::WebContentsTester* web_contents_tester() {
     return content::WebContentsTester::For(stub_->web_contents());
   }
 
   content::WebContents* web_contents() { return stub_->web_contents(); }
 
-  bool is_loading() { return stub_->is_loading(); }
+  bool is_loading() { return loader_ && stub_->is_loading(); }
 
  protected:
-  void ResetState() override;
+  void ResetLoader() override;
 
  private:
   background_loader::BackgroundLoaderContentsStub* stub_;
 };
 
 TestBackgroundLoaderOffliner::TestBackgroundLoaderOffliner(
     content::BrowserContext* browser_context,
     const OfflinerPolicy* policy,
     OfflinePageModel* offline_page_model)
     : BackgroundLoaderOffliner(browser_context, policy, offline_page_model) {}
 
 TestBackgroundLoaderOffliner::~TestBackgroundLoaderOffliner() {}
 
-void TestBackgroundLoaderOffliner::ResetState() {
-  pending_request_.reset();
+void TestBackgroundLoaderOffliner::ResetLoader() {
   stub_ = new background_loader::BackgroundLoaderContentsStub(browser_context_);
   loader_.reset(stub_);
-  content::WebContentsObserver::Observe(stub_->web_contents());
 }
 
 class BackgroundLoaderOfflinerTest : public testing::Test {
  public:
   BackgroundLoaderOfflinerTest();
   ~BackgroundLoaderOfflinerTest() override;
 
   void SetUp() override;
 
   TestBackgroundLoaderOffliner* offliner() const { return offliner_.get(); }
@@ skipping 493 matching lines @@
   CompleteLoading();
   PumpLoop();
 
   // One extra part should be added if the flag is on.
   content::MHTMLExtraParts* extra_parts =
       content::MHTMLExtraParts::FromWebContents(offliner()->web_contents());
   EXPECT_EQ(extra_parts->size(), 1);
 }
 
 }  // namespace offline_pages