Revise user-data-dir switch handling; avoid crashes.

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index e621b38649ee5a392b159f8f3ec7e50614d52baf..1d79c25c85aa9fd031bbc2c6e1815775e41e3cd0 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -5,7 +5,6 @@
 #include "chrome/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
-#include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ -15,16 +14,12 @@
 #include "base/path_service.h"
 #include "base/process/memory.h"
 #include "base/process/process_handle.h"
-#include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
@@ -583,32 +578,6 @@ void ChromeMainDelegate::PreSandboxStartup() {
   child_process_logging::Init();
 #endif
 
-  // Notice a user data directory override if any
-  base::FilePath user_data_dir =
-      command_line.GetSwitchValuePath(switches::kUserDataDir);
-#if defined(OS_LINUX)
-  // On Linux, Chrome does not support running multiple copies under different
-  // DISPLAYs, so the profile directory can be specified in the environment to
-  // support the virtual desktop use-case.
-  if (user_data_dir.empty()) {
-    std::string user_data_dir_string;
-    scoped_ptr<base::Environment> environment(base::Environment::Create());
-    if (environment->GetVar("CHROME_USER_DATA_DIR", &user_data_dir_string) &&
-        IsStringUTF8(user_data_dir_string)) {
-      user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
-    }
-  }
-#endif
-#if defined(OS_MACOSX) || defined(OS_WIN)
-  policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
-#endif
-  if (!user_data_dir.empty()) {
-    CHECK(PathService::OverrideAndCreateIfNeeded(
-        chrome::DIR_USER_DATA,
-        user_data_dir,

[Vitaly Buka (NO REVIEWS), 2014/02/20 11:24:07]

We need to revert this part of change or to find work around.

Service process also keeps config in user-data-dir
Non sandboxed child processes may write chrome_debug.log.

Myabe we can keep this code without CHECK.
and do CHECK() in browser process?

-        chrome::ProcessNeedsProfileDir(process_type)));
-  }
-
   stats_counter_timer_.reset(new base::StatsCounterTimer("Chrome.Init"));
   startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer>
                        (*stats_counter_timer_));