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

chrome/browser/background_mode_manager.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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 35 matching lines @@
 #include "chrome/browser/gtk/gtk_util.h"
 #endif
 
 #if defined(OS_LINUX)
 static const FilePath::CharType kAutostart[] = "autostart";
 static const FilePath::CharType kConfig[] = ".config";
 static const char kXdgConfigHome[] = "XDG_CONFIG_HOME";
 #endif
 
 #if defined(OS_WIN)
-#include "base/registry.h"
+#include "base/win/registry.h"
 const HKEY kBackgroundModeRegistryRootKey = HKEY_CURRENT_USER;
 const wchar_t* kBackgroundModeRegistrySubkey =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
 const wchar_t* kBackgroundModeRegistryKeyName = L"chromium";
 #endif
 
 #if defined(OS_LINUX)
 namespace {
 
 FilePath GetAutostartDirectory(base::Environment* environment) {
@@ skipping 327 matching lines @@
     bool is_hidden = false;
     if (!mac_util::CheckLoginItemStatus(&is_hidden) || !is_hidden)
       return;
 
     mac_util::RemoveFromLoginItems();
   }
 #elif defined(OS_WIN)
   // TODO(rickcam): Bug 53597: Make RegKey mockable.
   // TODO(rickcam): Bug 53600: Use distinct registry keys per flavor+profile.
   const wchar_t* key_name = kBackgroundModeRegistryKeyName;
-  RegKey read_key(kBackgroundModeRegistryRootKey,
-                  kBackgroundModeRegistrySubkey, KEY_READ);
-  RegKey write_key(kBackgroundModeRegistryRootKey,
-                   kBackgroundModeRegistrySubkey, KEY_WRITE);
+  base::win::RegKey read_key(kBackgroundModeRegistryRootKey,
+                             kBackgroundModeRegistrySubkey, KEY_READ);
+  base::win::RegKey write_key(kBackgroundModeRegistryRootKey,
+                              kBackgroundModeRegistrySubkey, KEY_WRITE);
   if (should_launch) {
     FilePath executable;
     if (!PathService::Get(base::FILE_EXE, &executable))
       return;
     std::wstring new_value = executable.value() +
         L" --enable-background-mode --no-startup-window";
     if (read_key.ValueExists(key_name)) {
       std::wstring current_value;
       if (read_key.ReadValue(key_name, &current_value) &&
           (current_value == new_value))
@@ skipping 102 matching lines @@
     browser = BrowserList::GetLastActive();
   }
   return browser;
 }
 
 // static
 void BackgroundModeManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
   prefs->RegisterBooleanPref(prefs::kLaunchOnStartupResetAllowed, false);
 }