Offline Pages: Removes the metadata consistency check from the model API.

This check is implementation-dependent (and unused outside the model).
As such it belongs only inside the offline page model.

BUG=622763

Review-Url: https://codereview.chromium.org/2345133002
Cr-Commit-Position: refs/heads/master@{#420700}

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

@@ -443,13 +443,6 @@ public class OfflinePageBridge {
         return mIsNativeOfflinePageModelLoaded;
     }
 
-    /**
-     * Starts a check of offline page metadata, e.g. are all offline copies present.
-     */
-    public void checkOfflinePageMetadata() {
-        nativeCheckMetadataConsistency(mNativeOfflinePageBridge);
-    }
-
     /**
      * Retrieves the extra request header to reload the offline page.
      * @param webContents Contents of the page to reload.
@@ -612,7 +605,6 @@ public class OfflinePageBridge {
             String clientNamespace, String clientId, boolean userRequested);
     private native void nativeDeletePages(
             long nativeOfflinePageBridge, Callback<Integer> callback, long[] offlineIds);
-    private native void nativeCheckMetadataConsistency(long nativeOfflinePageBridge);
     private native String nativeGetOfflinePageHeaderForReload(
             long nativeOfflinePageBridge, WebContents webContents);
 }

chrome/browser/android/offline_pages/offline_page_bridge.cc

@@ -451,12 +451,6 @@ void OfflinePageBridge::DeletePages(
       offline_ids, base::Bind(&DeletePageCallback, j_callback_ref));
 }
 
-void OfflinePageBridge::CheckMetadataConsistency(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj) {
-  offline_page_model_->CheckMetadataConsistency();
-}
-
 ScopedJavaLocalRef<jstring> OfflinePageBridge::GetOfflinePageHeaderForReload(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,

chrome/browser/android/offline_pages/offline_page_bridge.h

@@ -100,10 +100,6 @@ class OfflinePageBridge : public OfflinePageModel::Observer,
       const base::android::JavaParamRef<jobject>& j_callback_obj,
       const base::android::JavaParamRef<jlongArray>& j_offline_ids_array);
 
-  void CheckMetadataConsistency(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& obj);
-
   base::android::ScopedJavaLocalRef<jstring> GetOfflinePageHeaderForReload(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,

components/offline_pages/offline_page_model.h

@@ -168,13 +168,6 @@ class OfflinePageModel : public base::SupportsUserData {
   virtual const OfflinePageItem* MaybeGetBestPageForOnlineURL(
       const GURL& online_url) const = 0;
 
-  // Checks that all of the offline pages have corresponding offline copies,
-  // and all archived files have offline pages pointing to them.
-  // If a page is discovered to be missing an offline copy, its offline page
-  // metadata will be expired. If an archive file is discovered missing its
-  // offline page, it will be deleted.
-  virtual void CheckMetadataConsistency() = 0;
-
   // Marks pages with |offline_ids| as expired and deletes the associated
   // archive files.
   virtual void ExpirePages(const std::vector<int64_t>& offline_ids,

components/offline_pages/offline_page_model_impl.cc

@@ -655,12 +655,7 @@ const OfflinePageItem* OfflinePageModelImpl::MaybeGetBestPageForOnlineURL(
 }
 
 void OfflinePageModelImpl::CheckMetadataConsistency() {
-  RunWhenLoaded(
-      base::Bind(&OfflinePageModelImpl::CheckMetadataConsistencyWhenLoadDone,
-                 weak_ptr_factory_.GetWeakPtr()));
-}
-
-void OfflinePageModelImpl::CheckMetadataConsistencyWhenLoadDone() {
+  DCHECK(is_loaded_);
   archive_manager_->GetAllArchives(
       base::Bind(&OfflinePageModelImpl::CheckMetadataConsistencyForArchivePaths,
                  weak_ptr_factory_.GetWeakPtr()));

components/offline_pages/offline_page_model_impl.h

@@ -105,7 +105,6 @@ class OfflinePageModelImpl : public OfflinePageModel, public KeyedService {
       const MultipleOfflinePageItemCallback& callback) override;
   const OfflinePageItem* MaybeGetBestPageForOnlineURL(
       const GURL& online_url) const override;
-  void CheckMetadataConsistency() override;
   void ExpirePages(const std::vector<int64_t>& offline_ids,
                    const base::Time& expiration_time,
                    const base::Callback<void(bool)>& callback) override;
@@ -158,7 +157,8 @@ class OfflinePageModelImpl : public OfflinePageModel, public KeyedService {
       const GURL& offline_url,
       const SingleOfflinePageItemCallback& callback) const;
   void MarkPageAccessedWhenLoadDone(int64_t offline_id);
-  void CheckMetadataConsistencyWhenLoadDone();
+
+  void CheckMetadataConsistency();
 
   // Callback for loading pages from the offline page metadata store.
   void OnLoadDone(const base::TimeTicks& start_time,

components/offline_pages/offline_page_model_impl_unittest.cc

@@ -770,9 +770,12 @@ TEST_F(OfflinePageModelImplTest, DetectThatOfflineCopyIsMissing) {
 
   const OfflinePageItem* page = GetPageByOfflineId(offline_id);
 
-  // Delete the offline copy of the page and check the metadata.
+  // Delete the offline copy of the page.
   base::DeleteFile(page->file_path, false);
-  model()->CheckMetadataConsistency();
+
+  // Resetting the model will cause a consistency check.
+  ResetModel();
+
   PumpLoop();
 
   // Check if the page has been expired.

components/offline_pages/stub_offline_page_model.cc

@@ -61,7 +61,6 @@ const OfflinePageItem* StubOfflinePageModel::MaybeGetBestPageForOnlineURL(
     const GURL& online_url) const {
   return nullptr;
 }
-void StubOfflinePageModel::CheckMetadataConsistency() {}
 void StubOfflinePageModel::ExpirePages(
     const std::vector<int64_t>& offline_ids,
     const base::Time& expiration_time,

components/offline_pages/stub_offline_page_model.h

@@ -62,7 +62,6 @@ class StubOfflinePageModel : public OfflinePageModel, public KeyedService {
       const MultipleOfflinePageItemCallback& callback) override;
   const OfflinePageItem* MaybeGetBestPageForOnlineURL(
       const GURL& online_url) const override;
-  void CheckMetadataConsistency() override;
   void ExpirePages(const std::vector<int64_t>& offline_ids,
                    const base::Time& expiration_time,
                    const base::Callback<void(bool)>& callback) override;