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

chrome/browser/platform_util_win.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/browser/platform_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "app/win_util.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/logging.h"
-#include "base/registry.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/registry.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
 #include "gfx/native_widget_types.h"
 #include "googleurl/src/gurl.h"
 
 namespace platform_util {
 
 void ShowItemInFolder(const FilePath& full_path) {
   FilePath dir = full_path.DirName();
@@ skipping 72 matching lines @@
   // According to Mozilla in uriloader/exthandler/win/nsOSHelperAppService.cpp:
   // "Some versions of windows (Win2k before SP3, Win XP before SP1) crash in
   // ShellExecute on long URLs (bug 161357 on bugzilla.mozilla.org). IE 5 and 6
   // support URLS of 2083 chars in length, 2K is safe."
   const size_t kMaxUrlLength = 2048;
   if (escaped_url.length() > kMaxUrlLength) {
     NOTREACHED();
     return;
   }
 
-  RegKey key;
+  base::win::RegKey key;
   std::wstring registry_path = ASCIIToWide(url.scheme()) +
                                L"\\shell\\open\\command";
   key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
   if (key.Valid()) {
     DWORD size = 0;
     key.ReadValue(NULL, NULL, &size, NULL);
     if (size <= 2) {
       // ShellExecute crashes the process when the command is empty.
       // We check for "2" because it always returns the trailing NULL.
       // TODO(nsylvain): we should also add a dialog to warn on errors. See
@@ skipping 52 matching lines @@
 
     GoogleUpdateSettings::GetChromeChannel(is_system_install, &channel);
   }
   return UTF16ToASCII(channel);
 #else
   return std::string();
 #endif
 }
 
 }  // namespace platform_util