[Offline Pages] Remove obsolete synchronous API methods.

These became unused due to recent changes to the Bookmarks integration.

BUG=589526

Review URL: https://codereview.chromium.org/1921563005

Cr-Commit-Position: refs/heads/master@{#389900}

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java

@@ -262,18 +262,6 @@ public class OfflinePageBridge {
         nativeHasPages(mNativeOfflinePageBridge, namespace, callback);
     }
 
-    /**
-     * Returns whether we have any offline pages at all.
-     *
-     * This function may return false even if there are pages saved on disk, depending on the state
-     * of the OfflinePageModel.
-     *
-     * This function is deprecated.  Use OfflinePageBridge#hasPages instead.
-     */
-    public boolean maybeHasPages(String namespace) {
-        return nativeMaybeHasPages(mNativeOfflinePageBridge, namespace);
-    }
-
     /** @return A list of all offline ids that match a particular (namespace, client_id) pair. */
     Set<Long> getOfflineIdsForClientId(ClientId clientId) {
         assert mIsNativeOfflinePageModelLoaded;
@@ -475,17 +463,6 @@ public class OfflinePageBridge {
         return mIsNativeOfflinePageModelLoaded;
     }
 
-    /**
-     * @return Gets a list of pages that will be removed to clean up storage.  Requires that the
-     *     model is already loaded.
-     */
-    public List<OfflinePageItem> getPagesToCleanUp() {
-        assert mIsNativeOfflinePageModelLoaded;
-        List<OfflinePageItem> result = new ArrayList<OfflinePageItem>();
-        nativeGetPagesToCleanUp(mNativeOfflinePageBridge, result);
-        return result;
-    }
-
     /**
      * Starts a check of offline page metadata, e.g. are all offline copies present.
      */
@@ -612,7 +589,6 @@ public class OfflinePageBridge {
             final MultipleOfflinePageItemCallback callback);
     native void nativeHasPages(
             long nativeOfflinePageBridge, String nameSpace, final HasPagesCallback callback);
-    native boolean nativeMaybeHasPages(long nativeOfflinePageBridge, String nameSpace);
 
     @VisibleForTesting
     native long[] nativeGetOfflineIdsForClientId(
@@ -628,8 +604,6 @@ public class OfflinePageBridge {
             WebContents webContents, String clientNamespace, String clientId);
     private native void nativeDeletePages(
             long nativeOfflinePageBridge, DeletePageCallback callback, long[] offlineIds);
-    private native void nativeGetPagesToCleanUp(
-            long nativeOfflinePageBridge, List<OfflinePageItem> offlinePages);
     private native void nativeCheckMetadataConsistency(long nativeOfflinePageBridge);
     private native void nativeRecordStorageHistograms(long nativeOfflinePageBridge,
             long totalSpaceInBytes, long freeSpaceInBytes, boolean reportingAfterDelete);

chrome/browser/android/offline_pages/offline_page_bridge.cc

@@ -179,14 +179,6 @@ void OfflinePageBridge::HasPages(JNIEnv* env,
       name_space, base::Bind(&HasPagesCallback, j_callback_ref));
 }
 
-bool OfflinePageBridge::MaybeHasPages(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jstring>& j_namespace) {
-  std::string name_space = ConvertJavaStringToUTF8(env, j_namespace);
-  return offline_page_model_->MaybeHasPages(name_space);
-}
-
 void OfflinePageBridge::GetAllPages(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
@@ -205,17 +197,6 @@ void OfflinePageBridge::GetAllPages(
       base::Bind(&GetAllPagesCallback, j_result_ref, j_callback_ref));
 }
 
-void OfflinePageBridge::GetPagesToCleanUp(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& j_result_obj) {
-  DCHECK(offline_page_model_->is_loaded());
-  DCHECK(j_result_obj);
-  const std::vector<OfflinePageItem> offline_pages =
-      offline_page_model_->GetPagesToCleanUp();
-  ToJavaOfflinePageList(env, j_result_obj, offline_pages);
-}
-
 ScopedJavaLocalRef<jlongArray> OfflinePageBridge::GetOfflineIdsForClientId(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,

chrome/browser/android/offline_pages/offline_page_bridge.h

@@ -44,20 +44,11 @@ class OfflinePageBridge : public OfflinePageModel::Observer,
                 const base::android::JavaParamRef<jstring>& name_space,
                 const base::android::JavaParamRef<jobject>& j_callback_obj);
 
-  bool MaybeHasPages(JNIEnv* env,
-                     const base::android::JavaParamRef<jobject>& obj,
-                     const base::android::JavaParamRef<jstring>& name_space);
-
   void GetAllPages(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& obj,
                    const base::android::JavaParamRef<jobject>& j_result_obj,
                    const base::android::JavaParamRef<jobject>& j_callback_obj);
 
-  void GetPagesToCleanUp(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& obj,
-      const base::android::JavaParamRef<jobject>& j_result_obj);
-
   base::android::ScopedJavaLocalRef<jlongArray> GetOfflineIdsForClientId(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,

components/offline_pages/offline_page_model.cc

@@ -280,19 +280,18 @@ void OfflinePageModel::HasPages(const std::string& name_space,
 void OfflinePageModel::HasPagesAfterLoadDone(
     const std::string& name_space,
     const HasPagesCallback& callback) const {
-  callback.Run(MaybeHasPages(name_space));
-}
+  DCHECK(is_loaded_);
 
-bool OfflinePageModel::MaybeHasPages(const std::string& name_space) const {
-  if (!is_loaded_)
-    return false;
+  bool has_pages = false;
 
   for (const auto& id_page_pair : offline_pages_) {
-    if (id_page_pair.second.client_id.name_space == name_space)
-      return true;
+    if (id_page_pair.second.client_id.name_space == name_space) {
+      has_pages = true;
+      break;
+    }
   }
 
-  return false;
+  callback.Run(has_pages);
 }
 
 void OfflinePageModel::GetAllPages(const GetAllPagesCallback& callback) {

components/offline_pages/offline_page_model.h

@@ -174,14 +174,6 @@ class OfflinePageModel : public KeyedService, public base::SupportsUserData {
       const base::Callback<bool(const GURL&)>& predicate,
       const DeletePageCallback& callback);
 
-  // Returns true if there are offline pages in the given |name_space|.  This
-  // method is sync, so the result can be wrong depending on implementation
-  // details of the model.
-  //
-  // Currently, this will return |false| if the model is not loaded, even if
-  // there are pages on disk.
-  bool MaybeHasPages(const std::string& name_space) const;
-
   // Returns true via callback if there are offline pages in the given
   // |name_space|.
   void HasPages(const std::string& name_space,
@@ -192,6 +184,7 @@ class OfflinePageModel : public KeyedService, public base::SupportsUserData {
 
   // Gets pages that should be removed to clean up storage. Requires that the
   // model is loaded.
+  // TODO(fgorski): This needs an update as part of expiration policy work.
   const std::vector<OfflinePageItem> GetPagesToCleanUp() const;
 
   // Gets all offline ids where the offline page has the matching client id