Move clear cache code from chrome/ (ChromeWVGDelegate) to extensions/ (WVGuest)

extensions/browser/guest_view/web_view/web_view_guest.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 "extensions/browser/guest_view/web_view/web_view_guest.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/browsing_data/storage_partition_http_cache_data_remover.h"
+#include "components/web_cache/browser/web_cache_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 678 matching lines @@
   content::RecordAction(UserMetricsAction("WebView.Guest.ClearData"));
   content::StoragePartition* partition =
       content::BrowserContext::GetStoragePartition(
           web_contents()->GetBrowserContext(),
           web_contents()->GetSiteInstance());
 
   if (!partition)
     return false;
 
   if (removal_mask & webview::WEB_VIEW_REMOVE_DATA_MASK_CACHE) {
-    if (web_view_guest_delegate_) {
-      // First clear http cache data and then clear the rest in
-      // |ClearDataInternal|.
-      web_view_guest_delegate_->ClearCache(
-          remove_since, base::Bind(&WebViewGuest::ClearDataInternal,
-                                   weak_ptr_factory_.GetWeakPtr(), remove_since,
-                                   removal_mask, callback));
-      return true;
-    }
+    // First clear http cache data and then clear the rest in
+    // |ClearDataInternal|.
+    int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
+    // We need to clear renderer cache separately for our process because
+    // StoragePartitionHttpCacheDataRemover::ClearData() does not clear that.
+    web_cache::WebCacheManager::GetInstance()->Remove(render_process_id);
+    web_cache::WebCacheManager::GetInstance()->ClearCacheForProcess(
+        render_process_id);
+
+    base::Closure cache_removal_done_callback = base::Bind(
+        &WebViewGuest::ClearDataInternal, weak_ptr_factory_.GetWeakPtr(),
+        remove_since, removal_mask, callback);
+    // StoragePartitionHttpCacheDataRemover removes itself when it is done.
+    // components/, move |ClearCache| to WebViewGuest: http//crbug.com/471287.
+    browsing_data::StoragePartitionHttpCacheDataRemover::CreateForRange(
+        partition, remove_since, base::Time::Now())
+        ->Remove(cache_removal_done_callback);
+
+    return true;

[Fady Samuel, 2015/04/26 15:06:07]

I just noticed this early exit. What happens if you want to clear other pieces
of data?

[lazyboy, 2015/04/26 15:16:51]

ClearDataInternal above in |cache_removal_done_callback| will do that.

   }
 
   ClearDataInternal(remove_since, removal_mask, callback);
   return true;
 }
 
 WebViewGuest::WebViewGuest(content::WebContents* owner_web_contents)
     : GuestView<WebViewGuest>(owner_web_contents),
       rules_registry_id_(RulesRegistryService::kInvalidRulesRegistryID),
       find_helper_(this),
@@ skipping 686 matching lines @@
     scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
     DispatchEventToView(
         new GuestViewEvent(webview::kEventExitFullscreen, args.Pass()));
   }
   // Since we changed fullscreen state, sending a Resize message ensures that
   // renderer/ sees the change.
   web_contents()->GetRenderViewHost()->WasResized();
 }
 
 }  // namespace extensions