Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid.

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"
 
+class SafeBrowsingApiHandler;
+
 // 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();
+#endif
 
  private:
   scoped_ptr<content::BrowserMainRunner> browser_runner_;
 
+#if defined(SAFE_BROWSING_DB_REMOTE)
+  scoped_ptr<SafeBrowsingApiHandler> safe_browsing_api_handler_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid);
 };
 
 #endif  // CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_