Start requiring DistillerPage for calls to DomDistillerService.

components/dom_distiller/core/viewer_unittest.cc

 // Copyright 2014 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 "components/dom_distiller/core/viewer.h"
 
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/dom_distiller_test_util.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
@@ skipping 10 matching lines @@
   MOCK_METHOD1(OnArticleUpdated,
                void(ArticleDistillationUpdate article_update));
 };
 
 class TestDomDistillerService : public DomDistillerServiceInterface {
  public:
   TestDomDistillerService() {}
   virtual ~TestDomDistillerService() {}
 
   MOCK_CONST_METHOD0(GetSyncableService, syncer::SyncableService*());
-  MOCK_METHOD2(AddToList,
-               const std::string(const GURL&, const ArticleAvailableCallback&));
+  MOCK_METHOD3(AddToList,
+               const std::string(const GURL&,
+                                 DistillerPage*,
+                                 const ArticleAvailableCallback&));
+  virtual const std::string AddToList(
+      const GURL& url,
+      scoped_ptr<DistillerPage> distiller_page,
+      const ArticleAvailableCallback& article_cb) {
+    return AddToList(url, distiller_page.get(), article_cb);
+  }
   MOCK_CONST_METHOD0(GetEntries, std::vector<ArticleEntry>());
   MOCK_METHOD1(AddObserver, void(DomDistillerObserver*));
   MOCK_METHOD1(RemoveObserver, void(DomDistillerObserver*));
   MOCK_METHOD0(ViewUrlImpl, ViewerHandle*());
-  virtual scoped_ptr<ViewerHandle> ViewUrl(ViewRequestDelegate*, const GURL&) {
+  virtual scoped_ptr<ViewerHandle> ViewUrl(
+      ViewRequestDelegate*,
+      scoped_ptr<DistillerPage> distiller_page,
+      const GURL&) {
     return scoped_ptr<ViewerHandle>(ViewUrlImpl());
   }
   MOCK_METHOD0(ViewEntryImpl, ViewerHandle*());
-  virtual scoped_ptr<ViewerHandle> ViewEntry(ViewRequestDelegate*,
-                                             const std::string&) {
+  virtual scoped_ptr<ViewerHandle> ViewEntry(
+      ViewRequestDelegate*,
+      scoped_ptr<DistillerPage> distiller_page,
+      const std::string&) {
     return scoped_ptr<ViewerHandle>(ViewEntryImpl());
   }
   MOCK_METHOD0(RemoveEntryImpl, ArticleEntry*());
   virtual scoped_ptr<ArticleEntry> RemoveEntry(const std::string&) {
     return scoped_ptr<ArticleEntry>(RemoveEntryImpl());
   }
+  virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPage() {
+    return scoped_ptr<DistillerPage>();
+  }
 };
 
 class DomDistillerViewerTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     service_.reset(new TestDomDistillerService());
   }
 
  protected:
   scoped_ptr<ViewerHandle> CreateViewRequest(
@@ skipping 44 matching lines @@
   // Specify an internal Chrome page.
   CreateViewRequest("?" + std::string(kUrlKey) + "=chrome%3A%2F%2Fsettings%2F",
                     view_request_delegate.get());
   // Specify a recursive URL.
   CreateViewRequest("?" + std::string(kUrlKey) + "=" +
                         std::string(kTestScheme) + "%3A%2F%2Fabc-def%2F",
                     view_request_delegate.get());
 }
 
 }  // namespace dom_distiller