Get rid of unnecessary chrome_main_ files now that most of the code has been removed from them. I...

chrome/app/chrome_main.cc

Index: chrome/app/chrome_main.cc
===================================================================
--- chrome/app/chrome_main.cc	(revision 99456)
+++ chrome/app/chrome_main.cc	(working copy)
@@ -46,6 +46,8 @@
 #include <malloc.h>
 #include "base/string_util.h"
 #include "base/win/registry.h"
+#include "chrome/browser/policy/policy_path_parser.h"
+#include "policy/policy_constants.h"
 #include "sandbox/src/sandbox.h"
 #include "tools/memory_watcher/memory_watcher.h"
 #endif
@@ -148,6 +150,54 @@
   return (pos != std::wstring::npos);
 }
 
+// Checks if the registry key exists in the given hive and expands any
+// variables in the string.
+bool LoadUserDataDirPolicyFromRegistry(HKEY hive,
+                                       const std::wstring& key_name,
+                                       FilePath* user_data_dir) {
+  std::wstring value;
+
+  base::win::RegKey hklm_policy_key(hive, policy::kRegistrySubKey, KEY_READ);
+  if (hklm_policy_key.ReadValue(key_name.c_str(), &value) == ERROR_SUCCESS) {
+    *user_data_dir = FilePath(policy::path_parser::ExpandPathVariables(value));
+    return true;
+  }
+  return false;
+}
+
+void CheckUserDataDirPolicy(FilePath* user_data_dir) {
+  DCHECK(user_data_dir);
+  // We are running as Chrome Frame if we were invoked with user-data-dir,
+  // chrome-frame, and automation-channel switches.
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const bool is_chrome_frame =
+      !user_data_dir->empty() &&
+      command_line->HasSwitch(switches::kChromeFrame) &&
+      command_line->HasSwitch(switches::kAutomationClientChannelID);
+
+  // In the case of Chrome Frame, the last path component of the user-data-dir
+  // provided on the command line must be preserved since it is specific to
+  // CF's host.
+  FilePath cf_host_dir;
+  if (is_chrome_frame)
+    cf_host_dir = user_data_dir->BaseName();
+
+  // Policy from the HKLM hive has precedence over HKCU so if we have one here
+  // we don't have to try to load HKCU.
+  const char* key_name_ascii = (is_chrome_frame ? policy::key::kGCFUserDataDir :
+                                policy::key::kUserDataDir);
+  std::wstring key_name(ASCIIToWide(key_name_ascii));
+  if (LoadUserDataDirPolicyFromRegistry(HKEY_LOCAL_MACHINE, key_name,
+                                        user_data_dir) ||
+      LoadUserDataDirPolicyFromRegistry(HKEY_CURRENT_USER, key_name,
+                                        user_data_dir)) {
+    // A Group Policy value was loaded.  Append the Chrome Frame host directory
+    // if relevant.
+    if (is_chrome_frame)
+      *user_data_dir = user_data_dir->Append(cf_host_dir);
+  }
+}
+
 #endif  // defined(OS_WIN)
 
 #if defined(OS_LINUX)
@@ -361,7 +411,7 @@
 #endif
 
 #if defined(OS_MACOSX)
-    chrome_main::SetUpBundleOverrides();
+    SetUpBundleOverrides();
     chrome::common::mac::EnableCFBundleBlocker();
 #endif
 
@@ -512,7 +562,9 @@
     // Notice a user data directory override if any
     FilePath user_data_dir =
         command_line.GetSwitchValuePath(switches::kUserDataDir);
-    chrome_main::CheckUserDataDirPolicy(&user_data_dir);
+#if defined(OS_MACOSX) || defined(OS_WIN)
+    CheckUserDataDirPolicy(&user_data_dir);
+#endif
     if (!user_data_dir.empty())
       CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir));