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

chrome/installer/util/google_update_settings.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/google_update_settings.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
-#include "base/registry.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
+#include "base/win/registry.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
 
+using base::win::RegKey;
+
 namespace {
 
 bool ReadGoogleUpdateStrKey(const wchar_t* const name, std::wstring* value) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring reg_path = dist->GetStateKey();
   RegKey key(HKEY_CURRENT_USER, reg_path.c_str(), KEY_READ);
   if (!key.ReadValue(name, value)) {
     RegKey hklm_key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ);
     return hklm_key.ReadValue(name, value);
   }
@@ skipping 256 matching lines @@
   };
   const wchar_t** end = &kBrands[arraysize(kBrands)];
   const wchar_t** found = std::find(&kBrands[0], end, brand);
   if (found != end)
     return true;
   if (StartsWith(brand, L"EUB", true) || StartsWith(brand, L"EUC", true) ||
       StartsWith(brand, L"GGR", true))
     return true;
   return false;
 }