Componentize SafeBrowsingApi{Bridge,Handler}

components/safe_browsing_db/android/safe_browsing_api_handler_bridge.cc

 // Copyright 2016 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/android/safe_browsing/safe_browsing_api_handler_bridge.h"
+#include "components/safe_browsing_db/android/safe_browsing_api_handler_bridge.h"
 
 #include <memory>
 #include <string>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/histogram_macros.h"
-#include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "components/safe_browsing_db/safe_browsing_api_handler_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/SafeBrowsingApiBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetApplicationContext;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
@@ skipping 40 matching lines @@
   int int_threat_types[threat_types.size()];
   int* itr = &int_threat_types[0];
   for (auto threat_type : threat_types) {
     *itr++ = SBThreatTypeToJavaThreatType(threat_type);
   }
   return ToJavaIntArray(env, int_threat_types, threat_types.size());
 }
 
 }  // namespace
 
-
 bool RegisterSafeBrowsingApiBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // Java->Native call, invoked when a check is done.
 //   |callback_id| is an int form of pointer to a URLCheckCallbackMeta
 //                 that will be called and then deleted here.
 //   |result_status| is one of those from SafeBrowsingApiHandler.java
 //   |metadata| is a JSON string classifying the threat if there is one.
 void OnUrlCheckDone(JNIEnv* env,
@@ skipping 51 matching lines @@
     RunCallbackOnIOThread(callback.release(), worst_threat, threat_metadata);
   }
 }
 
 //
 // SafeBrowsingApiHandlerBridge
 //
 SafeBrowsingApiHandlerBridge::SafeBrowsingApiHandlerBridge()
     : checked_api_support_(false) {}
 
-SafeBrowsingApiHandlerBridge::~SafeBrowsingApiHandlerBridge() {
-}
+SafeBrowsingApiHandlerBridge::~SafeBrowsingApiHandlerBridge() {}
 
 bool SafeBrowsingApiHandlerBridge::CheckApiIsSupported() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!checked_api_support_) {
     DVLOG(1) << "Checking API support.";
-    j_api_handler_ = Java_SafeBrowsingApiBridge_create(
-        AttachCurrentThread(), GetApplicationContext());
+    j_api_handler_ = Java_SafeBrowsingApiBridge_create(AttachCurrentThread(),
+                                                       GetApplicationContext());
     checked_api_support_ = true;
   }
   return j_api_handler_.obj() != nullptr;
 }
 
 void SafeBrowsingApiHandlerBridge::StartURLCheck(
     const SafeBrowsingApiHandler::URLCheckCallbackMeta& callback,
     const GURL& url,
     const std::vector<SBThreatType>& threat_types) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 23 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jintArray> j_threat_types =
       SBThreatTypesToJavaArray(env, local_threat_types);
 
   Java_SafeBrowsingApiBridge_startUriLookup(env, j_api_handler_, callback_id,
                                             j_url, j_threat_types);
 }
 
 }  // namespace safe_browsing