Clear the shader disk cache whenver we receive REMOVE_CACHE.

chrome/browser/browsing_data/browsing_data_remover.cc

Index: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 1b74264bfb570c6716858725ca29fcfe47b03226..5989c4c9a861f79b6ac42acd3e574d5f3bf28130 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -516,6 +516,12 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
       prerender_manager->ClearData(
           prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS);
     }
+
+    // Tell the shader disk cache to clear.
+    waiting_for_clear_shader_cache_ = true;
+    content::RecordAction(UserMetricsAction("ClearBrowsingData_ShaderCache"));
+
+    ClearShaderCacheOnUIThread();
   }
 
 #if defined(ENABLE_PLUGINS)
@@ -533,13 +539,6 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
   }
 #endif
 
-  if (remove_mask & REMOVE_SHADER_CACHE) {
-    waiting_for_clear_shader_cache_ = true;
-    content::RecordAction(UserMetricsAction("ClearBrowsingData_ShaderCache"));
-
-    ClearShaderCacheOnUIThread();
-  }
-
   // Always wipe accumulated network related data (TransportSecurityState and
   // HttpServerPropertiesManager data).
   waiting_for_clear_networking_history_ = true;