📤 Upstream SafeBrowsingApiBridge.

chrome/app/android/chrome_main_delegate_android.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/app/android/chrome_main_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/base_paths_android.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/chrome_startup_flags.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/media/android/remote/remote_media_player_manager.h"
 #include "components/policy/core/browser/android/android_combined_policy_provider.h"
 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/public/browser/browser_main_runner.h"
 
 #if defined(SAFE_BROWSING_DB_REMOTE)
+#include "chrome/browser/android/safe_browsing/safe_browsing_api_handler_bridge.h"
 #include "components/safe_browsing_db/safe_browsing_api_handler.h"
 using safe_browsing::SafeBrowsingApiHandler;
 #endif
 
 namespace {
 
 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager(
     content::RenderFrameHost* render_frame_host) {
   return new remote_media::RemoteMediaPlayerManager(render_frame_host);
 }
 
 } // namespace
 
 // ChromeMainDelegateAndroid is created when the library is loaded. It is always
 // done in the process's main Java thread. But for non browser process, e.g.
 // renderer process, it is not the native Chrome's main thread.
 ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() {
 }
 
 ChromeMainDelegateAndroid::~ChromeMainDelegateAndroid() {
 }
 
 bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
 #if defined(SAFE_BROWSING_DB_REMOTE)
-  safe_browsing_api_handler_.reset(CreateSafeBrowsingApiHandler());
+  safe_browsing_api_handler_.reset(
+      new safe_browsing::SafeBrowsingApiHandlerBridge());
   SafeBrowsingApiHandler::SetInstance(safe_browsing_api_handler_.get());
 #endif
 
   policy::android::AndroidCombinedPolicyProvider::SetShouldWaitForPolicy(true);
   SetChromeSpecificCommandLineFlags();
   content::BrowserMediaPlayerManager::RegisterFactory(
       &CreateRemoteMediaPlayerManager);
 
   return ChromeMainDelegate::BasicStartupComplete(exit_code);
 }
@@ skipping 45 matching lines @@
 
   return ChromeMainDelegate::RunProcess(process_type, main_function_params);
 }
 
 void ChromeMainDelegateAndroid::ProcessExiting(
     const std::string& process_type) {
 #if defined(SAFE_BROWSING_DB_REMOTE)
   SafeBrowsingApiHandler::SetInstance(nullptr);
 #endif
 }
-
-#if defined(SAFE_BROWSING_DB_REMOTE)
-SafeBrowsingApiHandler*
-ChromeMainDelegateAndroid::CreateSafeBrowsingApiHandler() {
-  return nullptr;
-}
-#endif