8 files changed, 3 insertions, 47 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 063c156..f1d4fde 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -567,12 +567,8 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   CheckUserDataDirPolicy(&user_data_dir);
 #endif
-  if (!user_data_dir.empty()) {
-    CHECK(PathService::OverrideAndCreateIfNeeded(
-        chrome::DIR_USER_DATA,
-        user_data_dir,
-        chrome::ProcessNeedsProfileDir(process_type)));
-  }
+  if (!user_data_dir.empty())
+    CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir));
 
   startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer>
                        (content::Counters::chrome_main()));
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c7825bd..6fbf61e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1055,10 +1055,6 @@
             'tools/crash_service/crash_service.cc',
             'tools/crash_service/crash_service.h',
             'tools/crash_service/main.cc',
-            '../content/public/common/content_switches.cc',
-          ],
-          'defines': [
-            'COMPILE_CONTENT_STATICALLY',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 03aca08..37d1d92 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -15,7 +15,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/public/common/content_switches.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
@@ -145,9 +144,6 @@ bool PathProvider(int key, FilePath* result) {
   FilePath cur;
   switch (key) {
     case chrome::DIR_USER_DATA:
-      CHECK(ProcessNeedsProfileDir(
-          CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-              switches::kProcessType)));
       if (!GetDefaultUserDataDirectory(&cur)) {
         NOTREACHED();
         return false;
diff --git a/chrome/common/chrome_paths_internal.h b/chrome/common/chrome_paths_internal.h
index 0e60ce1..d4a1151 100644
--- a/chrome/common/chrome_paths_internal.h
+++ b/chrome/common/chrome_paths_internal.h
@@ -6,8 +6,6 @@
 #define CHROME_COMMON_CHROME_PATHS_INTERNAL_H_
 #pragma once
 
-#include <string>
-
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)
@@ -87,9 +85,6 @@ NSBundle* OuterAppBundle();
 
 #endif  // OS_MACOSX
 
-// Checks if the |process_type| has the rights to access the profile.
-bool ProcessNeedsProfileDir(const std::string& process_type);
-
 }  // namespace chrome
 
 #endif  // CHROME_COMMON_CHROME_PATHS_INTERNAL_H_
diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc
index b8987cf..acfebc1 100644
--- a/chrome/common/chrome_paths_linux.cc
+++ b/chrome/common/chrome_paths_linux.cc
@@ -103,11 +103,4 @@ bool GetUserDesktop(FilePath* result) {
   return true;
 }
 
-bool ProcessNeedsProfileDir(const std::string& process_type) {
-  // For now we have no reason to forbid this on Linux as we don't
-  // have the roaming profile troubles there. Moreover the Linux breakpad needs
-  // profile dir access in all process if enabled on Linux.
-  return true;
-}
-
 }  // namespace chrome
diff --git a/chrome/common/chrome_paths_mac.mm b/chrome/common/chrome_paths_mac.mm
index 284b3dd..f3783e0 100644
--- a/chrome/common/chrome_paths_mac.mm
+++ b/chrome/common/chrome_paths_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -199,10 +199,4 @@ NSBundle* OuterAppBundle() {
   return bundle;
 }
 
-bool ProcessNeedsProfileDir(const std::string& process_type) {
-  // For now we have no reason to forbid this on other MacOS as we don't
-  // have the roaming profile troubles there.
-  return true;
-}
-
 }  // namespace chrome
diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc
index 1a2f02ae..5eefb78 100644
--- a/chrome/common/chrome_paths_win.cc
+++ b/chrome/common/chrome_paths_win.cc
@@ -16,7 +16,6 @@
 #include "base/win/scoped_co_mem.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
-#include "content/public/common/content_switches.h"
 
 namespace chrome {
 
@@ -98,16 +97,4 @@ bool GetUserDesktop(FilePath* result) {
   return true;
 }
 
-bool ProcessNeedsProfileDir(const std::string& process_type) {
-  // On windows we don't want subprocesses other than the browser process and
-  // service processes to be able to use the profile directory because if it
-  // lies on a network share the sandbox will prevent us from accessing it.
-  // TODO(pastarmovj): For no gpu processes are whitelisted too because they do
-  // use the profile dir in some way but this must be investigated and fixed if
-  // possible.
-  return process_type.empty() ||
-         process_type == switches::kServiceProcess ||
-         process_type == switches::kGpuProcess;
-}
-
 }  // namespace chrome
diff --git a/chrome/common_constants.gypi b/chrome/common_constants.gypi
index 4762e1e..48ff259a 100644
--- a/chrome/common_constants.gypi
+++ b/chrome/common_constants.gypi
@@ -86,7 +86,6 @@
           ],
           'defines': [
             '<@(nacl_win64_defines)',
-            'COMPILE_CONTENT_STATICALLY',
           ],
           'configurations': {
             'Common_Base': {