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

chrome/app/android/chrome_main_delegate_android.h

 // 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.
 
 #ifndef CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
 #define CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/app/chrome_main_delegate.h"
 #include "content/public/browser/browser_main_runner.h"
 
+namespace safe_browsing {
 class SafeBrowsingApiHandler;
+}  // namespace safe_browsing

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

I prefer no trailing // namespace foo when the entire namespace is only 1 line
long on the inside.

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

Done.

 
 // Android override of ChromeMainDelegate
 class ChromeMainDelegateAndroid : public ChromeMainDelegate {
  public:
   static ChromeMainDelegateAndroid* Create();
 
  protected:
   ChromeMainDelegateAndroid();
   ~ChromeMainDelegateAndroid() override;
 
   bool BasicStartupComplete(int* exit_code) override;
   void SandboxInitialized(const std::string& process_type) override;
   int RunProcess(
       const std::string& process_type,
       const content::MainFunctionParams& main_function_params) override;
   void ProcessExiting(const std::string& process_type) override;
 
 #if defined(SAFE_BROWSING_DB_REMOTE)
-  virtual SafeBrowsingApiHandler* CreateSafeBrowsingApiHandler();
+  virtual safe_browsing::SafeBrowsingApiHandler* CreateSafeBrowsingApiHandler();
 #endif
 
  private:
   scoped_ptr<content::BrowserMainRunner> browser_runner_;
 
 #if defined(SAFE_BROWSING_DB_REMOTE)
-  scoped_ptr<SafeBrowsingApiHandler> safe_browsing_api_handler_;
+  scoped_ptr<safe_browsing::SafeBrowsingApiHandler> safe_browsing_api_handler_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid);
 };
 
 #endif  // CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_