Add support for not owning distilled WebContents

components/dom_distiller/content/distiller_page_web_contents_browsertest.cc

 // Copyright 2013 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 "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/dom_distiller/content/distiller_page_web_contents.h"
@@ skipping 143 matching lines @@
       scoped_ptr<SourcePageHandleWebContents> optional_web_contents_handle,
       bool expect_new_web_contents)
       : DistillerPageWebContents(browser_context, render_view_size,
                                  optional_web_contents_handle.Pass()),
         expect_new_web_contents_(expect_new_web_contents),
         new_web_contents_created_(false) {}
 
   void CreateNewWebContents(const GURL& url) override {
     ASSERT_EQ(true, expect_new_web_contents_);
     new_web_contents_created_ = true;
-    // DistillerPageWebContents::CreateNewWebContents resets the scoped_ptr to
-    // the WebContents, so intentionally leak WebContents here, since it is
-    // owned by the shell.
-    content::WebContents* web_contents = web_contents_.release();
-    web_contents->GetLastCommittedURL();
     DistillerPageWebContents::CreateNewWebContents(url);
   }
 
-  ~TestDistillerPageWebContents() override {
-    if (!expect_new_web_contents_) {
-      // Intentionally leaking WebContents, since it is owned by the shell.
-      content::WebContents* web_contents = web_contents_.release();
-      web_contents->GetLastCommittedURL();
-    }
-  }
-
   bool new_web_contents_created() { return new_web_contents_created_; }
 
  private:
   bool expect_new_web_contents_;
   bool new_web_contents_created_;
 };
 
 IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, BasicDistillationWorks) {
   DistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
@@ skipping 163 matching lines @@
   WebContentsMainFrameHelper main_frame_loaded(current_web_contents,
                                                url_loaded_runner.QuitClosure(),
                                                wait_for_document_loaded);
   current_web_contents->GetController().LoadURL(
       embedded_test_server()->GetURL(url),
       content::Referrer(),
       ui::PAGE_TRANSITION_TYPED,
       std::string());
   url_loaded_runner.Run();
 
-  scoped_ptr<content::WebContents> old_web_contents_sptr(current_web_contents);
   scoped_ptr<SourcePageHandleWebContents> source_page_handle(
-      new SourcePageHandleWebContents(old_web_contents_sptr.Pass()));
+      new SourcePageHandleWebContents(current_web_contents, false));
 
   TestDistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
       shell()->web_contents()->GetContainerBounds().size(),
       source_page_handle.Pass(),
       expect_new_web_contents);
   distiller_page_ = &distiller_page;
 
   base::RunLoop run_loop;
   DistillPage(run_loop.QuitClosure(), kSimpleArticlePath);
@@ skipping 142 matching lines @@
   ASSERT_TRUE(js_result_);
   ASSERT_TRUE(js_result_->GetAsDictionary(&dict));
 
   ASSERT_TRUE(dict->HasKey("success"));
   bool success;
   ASSERT_TRUE(dict->GetBoolean("success", &success));
   EXPECT_TRUE(success);
 }
 
 }  // namespace dom_distiller