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

chrome/installer/util/package.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 "chrome/installer/util/package.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/delete_tree_work_item.h"
@@ skipping 40 matching lines @@
   if (!products_.size()) {
     NOTREACHED() << "this should not be possible";
     return false;
   }
   return products_[0]->system_level();
 }
 
 FilePath Package::GetInstallerDirectory(
     const Version& version) const {
   return path_.Append(version.GetString())
-      .Append(installer_util::kInstallerDir);
+      .Append(installer::kInstallerDir);
 }
 
 Version* Package::GetCurrentVersion() const {
   scoped_ptr<Version> current_version;
   // Be aware that there might be a pending "new_chrome.exe" already in the
   // installation path.
-  FilePath new_chrome_exe(path_.Append(installer_util::kChromeNewExe));
+  FilePath new_chrome_exe(path_.Append(installer::kChromeNewExe));
   bool new_chrome_exists = file_util::PathExists(new_chrome_exe);
 
   for (size_t i = 0; i < products_.size(); ++i) {
     const Product* product = products_[i];
     HKEY root = product->system_level() ? HKEY_LOCAL_MACHINE :
                                           HKEY_CURRENT_USER;
     RegKey chrome_key(root, product->distribution()->GetVersionKey().c_str(),
                       KEY_READ);
     std::wstring version;
     if (new_chrome_exists)
@@ skipping 68 matching lines @@
       }
     }
     ret = FindNextFile(file_handle, &find_file_data);
   }
 
   FindClose(file_handle);
 }
 
 }  // namespace installer