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

Index: chrome/app/android/chrome_main_delegate_android.h
diff --git a/chrome/app/android/chrome_main_delegate_android.h b/chrome/app/android/chrome_main_delegate_android.h
index 1a34203c9246ab69de653a28d637e3db752b519f..c3a4d2f33dc46bfee9c8bc6021fbdc7c18d6a3d9 100644
--- a/chrome/app/android/chrome_main_delegate_android.h
+++ b/chrome/app/android/chrome_main_delegate_android.h
@@ -9,7 +9,9 @@
 #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 {
@@ -28,14 +30,14 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate {
   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);