[Offline Pages] Clear offline pages when user clears cache.

chrome/browser/browsing_data/browsing_data_remover.cc

 // Copyright (c) 2012 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 "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 986 matching lines @@
 #if BUILDFLAG(ANDROID_JAVA_UI)
   if (remove_mask & REMOVE_WEBAPP_DATA) {
     // Clear all data associated with registered webapps. The webapp_registry
     // makes a JNI call into a Java-side AsyncTask, so don't wait for the reply.
     waiting_for_clear_webapp_data_ = true;
     webapp_registry_->UnregisterWebapps(
         base::Bind(&BrowsingDataRemover::OnClearedWebappData,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if ((remove_mask & REMOVE_OFFLINE_PAGE_DATA) &&
-      offline_pages::IsOfflinePagesEnabled()) {
+  // For now we're considering offline pages as cache, so if we're removing
+  // cache we should remove offline pages as well.
+  if ((remove_mask & REMOVE_CACHE) && offline_pages::IsOfflinePagesEnabled()) {
     waiting_for_clear_offline_page_data_ = true;
     offline_pages::OfflinePageModelFactory::GetForBrowserContext(profile_)
         ->DeletePagesByURLPredicate(
             filter,
             base::Bind(&BrowsingDataRemover::OnClearedOfflinePageData,
                        weak_ptr_factory_.GetWeakPtr()));
   }
 #endif
 
   // Record the combined deletion of cookies and cache.
@@ skipping 311 matching lines @@
   waiting_for_clear_domain_reliability_monitor_ = false;
   NotifyIfDone();
 }
 
 // static
 BrowsingDataRemover::CallbackSubscription
     BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
         const BrowsingDataRemover::Callback& callback) {
   return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
 }