Refactor BrowsingDataRemover to mock out WebappRegistry.

chrome/browser/android/webapps/webapp_registry.cc

Index: chrome/browser/android/webapps/webapp_registry.cc
diff --git a/chrome/browser/android/webapps/webapp_registry.cc b/chrome/browser/android/webapps/webapp_registry.cc
index 588e3addc1e56a0602129895bf8db357899a680a..f021511ddb6f72c66cba173fce9c6e735ff16b80 100644
--- a/chrome/browser/android/webapps/webapp_registry.cc
+++ b/chrome/browser/android/webapps/webapp_registry.cc
@@ -13,9 +13,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "jni/WebappRegistry_jni.h"
 
-// static
-void WebappRegistry::UnregisterWebapps(
-    const base::Closure& callback) {
+void WebappRegistry::UnregisterWebapps(const base::Closure& callback) {
   JNIEnv* env = base::android::AttachCurrentThread();
   uintptr_t callback_pointer = reinterpret_cast<uintptr_t>(
       new base::Closure(callback));
@@ -28,7 +26,7 @@ void WebappRegistry::UnregisterWebapps(
 
 // Callback used by Java when all web apps have been unregistered.
 void OnWebappsUnregistered(JNIEnv* env,
-                           const JavaParamRef<jclass>& klass,
+                           const JavaParamRef<jclass>& clazz,
                            jlong jcallback) {
   base::Closure* callback = reinterpret_cast<base::Closure*>(jcallback);
   callback->Run();