Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid.

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 d03019c842092996e8f592cce4d978d8f19323aa..d680aebb4b77158792fbd99184fb2e6744ddf59d 100644
--- a/chrome/app/android/chrome_main_delegate_android.h
+++ b/chrome/app/android/chrome_main_delegate_android.h
@@ -8,6 +8,8 @@
 #include "chrome/app/chrome_main_delegate.h"
 #include "content/public/browser/browser_main_runner.h"
 
+class SafeBrowsingApiHandler;
+
 // Android override of ChromeMainDelegate
 class ChromeMainDelegateAndroid : public ChromeMainDelegate {
  public:
@@ -18,16 +20,23 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate {
   ~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();
+#endif
 
  private:
   scoped_ptr<content::BrowserMainRunner> browser_runner_;
 
+#if defined(SAFE_BROWSING_DB_REMOTE)
+  scoped_ptr<SafeBrowsingApiHandler> safe_browsing_api_handler_;

[bartfab (slow), 2015/09/03 09:51:57]

Nit: #include "base/memory/scoped_ptr.h"

[newt (away), 2015/09/03 18:35:24]

Done.

+#endif
+
   DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid);
 };