Remove dead methods from DomDistillerService

After recent cleanups, HasEntry(), GetUrlForEntry(), and ViewEntry()
didn't do anything useful anymore.

Bug: 1007942
Change-Id: I14cfaf0804bed1f280c9710b470e81968090d639
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1855982
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Auto-Submit: Marc Treib <treib@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705299}

chrome/browser/dom_distiller/lazy_dom_distiller_service.cc

@@ -32,22 +32,6 @@ LazyDomDistillerService* LazyDomDistillerService::Create(Profile* profile) {
 
 LazyDomDistillerService::~LazyDomDistillerService() = default;
 
-bool LazyDomDistillerService::HasEntry(const std::string& entry_id) {
-  return GetImpl()->HasEntry(entry_id);
-}
-
-std::string LazyDomDistillerService::GetUrlForEntry(
-    const std::string& entry_id) {
-  return GetImpl()->GetUrlForEntry(entry_id);
-}
-
-std::unique_ptr<ViewerHandle> LazyDomDistillerService::ViewEntry(
-    ViewRequestDelegate* delegate,
-    std::unique_ptr<DistillerPage> distiller_page,
-    const std::string& entry_id) {
-  return GetImpl()->ViewEntry(delegate, std::move(distiller_page), entry_id);
-}
-
 std::unique_ptr<ViewerHandle> LazyDomDistillerService::ViewUrl(
     ViewRequestDelegate* delegate,
     std::unique_ptr<DistillerPage> distiller_page,

chrome/browser/dom_distiller/lazy_dom_distiller_service.h

@@ -28,12 +28,6 @@ class LazyDomDistillerService : public DomDistillerServiceInterface,
   ~LazyDomDistillerService() override;
 
   // DomDistillerServiceInterface implementation:
-  bool HasEntry(const std::string& entry_id) override;
-  std::string GetUrlForEntry(const std::string& entry_id) override;
-  std::unique_ptr<ViewerHandle> ViewEntry(
-      ViewRequestDelegate* delegate,
-      std::unique_ptr<DistillerPage> distiller_page,
-      const std::string& entry_id) override;
   std::unique_ptr<ViewerHandle> ViewUrl(
       ViewRequestDelegate* delegate,
       std::unique_ptr<DistillerPage> distiller_page,

components/dom_distiller/core/dom_distiller_service.cc

@@ -56,21 +56,6 @@ DomDistillerService::CreateDefaultDistillerPageWithHandle(
       std::move(handle));
 }
 
-bool DomDistillerService::HasEntry(const std::string& entry_id) {
-  return false;
-}
-
-std::string DomDistillerService::GetUrlForEntry(const std::string& entry_id) {
-  return "";
-}
-
-std::unique_ptr<ViewerHandle> DomDistillerService::ViewEntry(
-    ViewRequestDelegate* delegate,
-    std::unique_ptr<DistillerPage> distiller_page,
-    const std::string& entry_id) {
-  return nullptr;
-}
-
 std::unique_ptr<ViewerHandle> DomDistillerService::ViewUrl(
     ViewRequestDelegate* delegate,
     std::unique_ptr<DistillerPage> distiller_page,

components/dom_distiller/core/dom_distiller_service.h

@@ -34,14 +34,6 @@ class DomDistillerServiceInterface {
   typedef base::Callback<void(bool)> ArticleAvailableCallback;
   virtual ~DomDistillerServiceInterface() {}
 
-  // TODO(crbug.com/1007942): Remove these methods; no entries ever exist.
-  virtual bool HasEntry(const std::string& entry_id) = 0;
-  virtual std::string GetUrlForEntry(const std::string& entry_id) = 0;
-  virtual std::unique_ptr<ViewerHandle> ViewEntry(
-      ViewRequestDelegate* delegate,
-      std::unique_ptr<DistillerPage> distiller_page,
-      const std::string& entry_id) = 0;
-
   // Request to view an article by url.
   // Use CreateDefaultDistillerPage() to create a default |distiller_page|.
   // The provided |distiller_page| is only used if there is not already a
@@ -78,12 +70,6 @@ class DomDistillerService : public DomDistillerServiceInterface {
   ~DomDistillerService() override;
 
   // DomDistillerServiceInterface implementation.
-  bool HasEntry(const std::string& entry_id) override;
-  std::string GetUrlForEntry(const std::string& entry_id) override;
-  std::unique_ptr<ViewerHandle> ViewEntry(
-      ViewRequestDelegate* delegate,
-      std::unique_ptr<DistillerPage> distiller_page,
-      const std::string& entry_id) override;
   std::unique_ptr<ViewerHandle> ViewUrl(
       ViewRequestDelegate* delegate,
       std::unique_ptr<DistillerPage> distiller_page,

components/dom_distiller/core/dom_distiller_service_android.cc

@@ -34,18 +34,14 @@ bool DomDistillerServiceAndroid::HasEntry(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_entry_id) {
-  const std::string entry_id =
-      base::android::ConvertJavaStringToUTF8(env, j_entry_id);
-  return service_->HasEntry(entry_id);
+  return false;
 }
 
 ScopedJavaLocalRef<jstring> DomDistillerServiceAndroid::GetUrlForEntry(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_entry_id) {
-  const std::string entry_id =
-      base::android::ConvertJavaStringToUTF8(env, j_entry_id);
-  return ConvertUTF8ToJavaString(env, service_->GetUrlForEntry(entry_id));
+  return ConvertUTF8ToJavaString(env, std::string());
 }
 
 jlong DomDistillerServiceAndroid::GetDistilledPagePrefsPtr(JNIEnv* env) {

components/dom_distiller/core/dom_distiller_service_android.h

@@ -24,6 +24,8 @@ class DomDistillerServiceAndroid {
   // Returns native pointer to native DistilledPagePrefs registered with
   // DomDistillerService.
   jlong GetDistilledPagePrefsPtr(JNIEnv* env);
+  // TODO(crbug.com/1007942): Remove HasEntry and GetUrlForEntry, they always
+  // return false / empty string.
   bool HasEntry(JNIEnv* env,
                 const base::android::JavaParamRef<jobject>& obj,
                 const base::android::JavaParamRef<jstring>& entry_id);

components/dom_distiller/core/viewer.cc

@@ -270,10 +270,7 @@ std::unique_ptr<ViewerHandle> CreateViewRequest(
   }
 
   if (has_valid_entry_id) {
-    return dom_distiller_service->ViewEntry(
-        view_request_delegate,
-        dom_distiller_service->CreateDefaultDistillerPage(render_view_size),
-        entry_id);
+    return nullptr;
   }
   if (has_valid_url) {
     return dom_distiller_service->ViewUrl(

components/dom_distiller/core/viewer_unittest.cc

@@ -41,8 +41,6 @@ class TestDomDistillerService : public DomDistillerServiceInterface {
   TestDomDistillerService() {}
   ~TestDomDistillerService() override {}
 
-  MOCK_METHOD1(HasEntry, bool(const std::string&));
-  MOCK_METHOD1(GetUrlForEntry, std::string(const std::string&));
   MOCK_METHOD0(ViewUrlImpl, ViewerHandle*());
   std::unique_ptr<ViewerHandle> ViewUrl(
       ViewRequestDelegate*,
@@ -50,13 +48,6 @@ class TestDomDistillerService : public DomDistillerServiceInterface {
       const GURL&) override {
     return std::unique_ptr<ViewerHandle>(ViewUrlImpl());
   }
-  MOCK_METHOD0(ViewEntryImpl, ViewerHandle*());
-  std::unique_ptr<ViewerHandle> ViewEntry(
-      ViewRequestDelegate*,
-      std::unique_ptr<DistillerPage> distiller_page,
-      const std::string&) override {
-    return std::unique_ptr<ViewerHandle>(ViewEntryImpl());
-  }
   std::unique_ptr<DistillerPage> CreateDefaultDistillerPage(
       const gfx::Size& render_view_size) override {
     return std::unique_ptr<DistillerPage>();
@@ -89,26 +80,13 @@ TEST_F(DomDistillerViewerTest, TestCreatingViewUrlRequest) {
   ViewerHandle* viewer_handle(new ViewerHandle(ViewerHandle::CancelCallback()));
   EXPECT_CALL(*service_, ViewUrlImpl())
       .WillOnce(testing::Return(viewer_handle));
-  EXPECT_CALL(*service_, ViewEntryImpl()).Times(0);
   CreateViewRequest(GetDistillerViewUrlFromUrl("http://www.example.com/"),
                     view_request_delegate.get());
 }
 
-TEST_F(DomDistillerViewerTest, TestCreatingViewEntryRequest) {
-  std::unique_ptr<FakeViewRequestDelegate> view_request_delegate(
-      new FakeViewRequestDelegate());
-  ViewerHandle* viewer_handle(new ViewerHandle(ViewerHandle::CancelCallback()));
-  EXPECT_CALL(*service_, ViewEntryImpl())
-      .WillOnce(testing::Return(viewer_handle));
-  EXPECT_CALL(*service_, ViewUrlImpl()).Times(0);
-  CreateViewRequest(GetDistillerViewUrlFromEntryId("abc-def"),
-                    view_request_delegate.get());
-}
-
 TEST_F(DomDistillerViewerTest, TestCreatingInvalidViewRequest) {
   std::unique_ptr<FakeViewRequestDelegate> view_request_delegate(
       new FakeViewRequestDelegate());
-  EXPECT_CALL(*service_, ViewEntryImpl()).Times(0);
   EXPECT_CALL(*service_, ViewUrlImpl()).Times(0);
   // Specify none of the required query parameters.
   CreateViewRequest(GURL(std::string(kDomDistillerScheme) + "://host?foo=bar"),