Move pe_image and registry from base to base/win and use the namespace. It re...

chrome/installer/util/shell_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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/master_preferences.h"
 
 #include "installer_util_strings.h"
 
+using base::win::RegKey;
+
 namespace {
 
 // This class represents a single registry entry. The objective is to
 // encapsulate all the registry entries required for registering Chrome at one
 // place. This class can not be instantiated outside the class and the objects
 // of this class type can be obtained only by calling a static method of this
 // class.
 class RegistryEntry {
  public:
   // This method returns a list of all the registry entries that
@@ skipping 517 matching lines @@
     *path = qlaunch;
   }
   file_util::AppendToPath(path, kQuickLaunchPath);
   return true;
 }
 
 void ShellUtil::GetRegisteredBrowsers(std::map<std::wstring,
                                       std::wstring>* browsers) {
   std::wstring base_key(ShellUtil::kRegStartMenuInternet);
   HKEY root = HKEY_LOCAL_MACHINE;
-  for (RegistryKeyIterator iter(root, base_key.c_str()); iter.Valid(); ++iter) {
+  for (base::win::RegistryKeyIterator iter(root, base_key.c_str());
+       iter.Valid(); ++iter) {
     std::wstring key = base_key + L"\\" + iter.Name();
     RegKey capabilities(root, (key + L"\\Capabilities").c_str(), KEY_READ);
     std::wstring name;
     if (!capabilities.Valid() ||
         !capabilities.ReadValue(L"ApplicationName", &name)) {
       RegKey base_key(root, key.c_str(), KEY_READ);
       if (!base_key.ReadValue(L"", &name))
         continue;
     }
     RegKey install_info(root, (key + L"\\InstallInfo").c_str(), KEY_READ);
@@ skipping 216 matching lines @@
         chrome_exe.c_str(),                // target
         shortcut.c_str(),                  // shortcut
         chrome_path.c_str(),               // working dir
         NULL,                              // arguments
         description.c_str(),               // description
         chrome_exe.c_str(),                // icon file
         icon_index,                        // icon index
         dist->GetBrowserAppId().c_str());  // app id
   }
 }