Merge the installer, installer_util and setup_util namespaces into a single i...

chrome/app/client_util.cc

 // Copyright (c) 2010 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 <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/environment.h"
@@ skipping 40 matching lines @@
                                                             HKEY_LOCAL_MACHINE;
   HKEY key;
   if (::RegOpenKeyEx(reg_root, key_path, 0, KEY_READ, &key) != ERROR_SUCCESS)
     return false;
 
   // If 'new_chrome.exe' is present it means chrome was auto-updated while
   // running. We need to consult the opv value so we can load the old dll.
   // TODO(cpu) : This is solving the same problem as the environment variable
   // so one of them will eventually be deprecated.
   std::wstring new_chrome_exe(exe_path);
-  new_chrome_exe.append(installer_util::kChromeNewExe);
+  new_chrome_exe.append(installer::kChromeNewExe);
   if (::PathFileExistsW(new_chrome_exe.c_str()) &&
       ReadRegistryStr(key, google_update::kRegOldVersionField, version)) {
     ::RegCloseKey(key);
     return true;
   }
 
   bool ret = ReadRegistryStr(key, google_update::kRegVersionField, version);
   ::RegCloseKey(key);
   return ret;
 }
@@ skipping 24 matching lines @@
 // value not being null to determine if this path contains a valid dll.
 HMODULE LoadChromeWithDirectory(std::wstring* dir) {
   ::SetCurrentDirectoryW(dir->c_str());
   const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
 #ifdef _WIN64
   if ((cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
       switches::kNaClBrokerProcess) ||
       (cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
       switches::kNaClLoaderProcess)) {
     // Load the 64-bit DLL when running in a 64-bit process.
-    dir->append(installer_util::kChromeNaCl64Dll);
+    dir->append(installer::kChromeNaCl64Dll);
   } else {
     // Only NaCl broker and loader can be launched as Win64 processes.
     NOTREACHED();
     return NULL;
   }
 #else
-  dir->append(installer_util::kChromeDll);
+  dir->append(installer::kChromeDll);
 #endif
 
 #ifdef NDEBUG
   // Experimental pre-reading optimization
   // The idea is to pre read significant portion of chrome.dll in advance
   // so that subsequent hard page faults are avoided.
   if (!cmd_line.HasSwitch(switches::kProcessType)) {
     // The kernel brings in 8 pages for the code section at a time and 4 pages
     // for other sections. We can skip over these pages to avoid a soft page
     // fault which may not occur during code execution. However skipping 4K at
@@ skipping 208 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }