Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid.

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/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/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"
+#endif
+
 namespace {
 
 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager(
     content::RenderFrameHost* render_frame_host) {
   return new remote_media::RemoteMediaPlayerManager(render_frame_host);
 }
 
 } // namespace
 
 // ChromeMainDelegateAndroid is created when the library is loaded. It is always
 // done in the process's main Java thread. But for non browser process, e.g.
 // renderer process, it is not the native Chrome's main thread.
 ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() {
 }
 
 ChromeMainDelegateAndroid::~ChromeMainDelegateAndroid() {
 }
+
+bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
+#if defined(SAFE_BROWSING_DB_REMOTE)
+  safe_browsing_api_handler_.reset(CreateSafeBrowsingApiHandler());
+  SafeBrowsingApiHandler::SetInstance(safe_browsing_api_handler_.get());
+#endif
+
+  policy::android::AndroidCombinedPolicyProvider::SetShouldWaitForPolicy(true);
+  SetChromeSpecificCommandLineFlags();
+  content::BrowserMediaPlayerManager::RegisterFactory(
+      &CreateRemoteMediaPlayerManager);
+
+  return ChromeMainDelegate::BasicStartupComplete(exit_code);
+}
+
 void ChromeMainDelegateAndroid::SandboxInitialized(
     const std::string& process_type) {
   ChromeMainDelegate::SandboxInitialized(process_type);
 }
 
 int ChromeMainDelegateAndroid::RunProcess(
     const std::string& process_type,
     const content::MainFunctionParams& main_function_params) {
   TRACE_EVENT0("startup", "ChromeMainDelegateAndroid::RunProcess")
   if (process_type.empty()) {
+    // By default, Android creates the directory accessible by others.
+    // We'd like to tighten security and make it accessible only by
+    // the browser process.
+    base::FilePath data_path;
+    bool ok = PathService::Get(base::DIR_ANDROID_APP_DATA, &data_path);

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

Nit: #include "base/base_paths_android.h"

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

Done.

+    if (ok) {
+      int permissions;
+      ok = base::GetPosixFilePermissions(data_path, &permissions);
+      if (ok)
+        permissions &= base::FILE_PERMISSION_USER_MASK;
+      else

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

Nit: Curly braces are required for multi-line conditionals.

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

Done.

+        permissions = base::FILE_PERMISSION_READ_BY_USER |
+                      base::FILE_PERMISSION_WRITE_BY_USER |
+                      base::FILE_PERMISSION_EXECUTE_BY_USER;
+
+      ok = base::SetPosixFilePermissions(data_path, permissions);
+    }
+    if (!ok)
+      LOG(ERROR) << "Failed to set permission of " << data_path.value().c_str();

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

Nit: #include <string> to be able to call c_str() or simply remove that part.
LOG(ERROR) is able to handle std::string directly anyway.

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

Just removed c_str()

+
     // Because the browser process can be started asynchronously as a series of
     // UI thread tasks a second request to start it can come in while the
     // first request is still being processed. Chrome must keep the same
     // browser runner for the second request.
     // Also only record the start time the first time round, since this is the
     // start time of the application, and will be same for all requests.
     if (!browser_runner_.get()) {
       base::Time time = chrome::android::GetMainEntryPointTime();
       startup_metric_utils::RecordMainEntryPointTime(time);
       browser_runner_.reset(content::BrowserMainRunner::Create());
     }
     return browser_runner_->Initialize(main_function_params);
   }
 
   return ChromeMainDelegate::RunProcess(process_type, main_function_params);
 }
 
-bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
-  SetChromeSpecificCommandLineFlags();
+void ChromeMainDelegateAndroid::ProcessExiting(
+    const std::string& process_type) {
+#if defined(SAFE_BROWSING_DB_REMOTE)
+  SafeBrowsingApiHandler::SetInstance(NULL);

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

Nit: s/NULL/nullptr/

+#endif
+}
 
-  content::BrowserMediaPlayerManager::RegisterFactory(
-      &CreateRemoteMediaPlayerManager);
-
-  return ChromeMainDelegate::BasicStartupComplete(exit_code);
+#if defined(SAFE_BROWSING_DB_REMOTE)
+SafeBrowsingApiHandler*
+ChromeMainDelegateAndroid::CreateSafeBrowsingApiHandler() {
+  return NULL;

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

Nit: s/NULL/nullptr/

 }
+#endif