Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace.

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/safe_browsing/safe_browsing_api_handler.h"
+using safe_browsing::SafeBrowsingApiHandler;

[Lei Zhang, 2015/11/12 22:56:45]

There's only a few users. Just add safe_browsing:: where needed?

[vakh (old account. dont use), 2015/11/12 23:04:10]

There are 3 locations.
We decided to have a threshold of 3 or more locations for using "using" for this
CL so keeping it as-is to remain consistent with the rest of the files in the
CL.

 #endif
 
 namespace {
 
 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager(
     content::RenderFrameHost* render_frame_host) {
   return new remote_media::RemoteMediaPlayerManager(render_frame_host);
 }
 
 } // namespace
@@ skipping 75 matching lines @@
   SafeBrowsingApiHandler::SetInstance(nullptr);
 #endif
 }
 
 #if defined(SAFE_BROWSING_DB_REMOTE)
 SafeBrowsingApiHandler*
 ChromeMainDelegateAndroid::CreateSafeBrowsingApiHandler() {
   return nullptr;
 }
 #endif