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

chrome/browser/extensions/extension_rlz_apitest.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 <map>
 
-#include "base/registry.h"
+#include "base/win/registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_rlz_module.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "rlz/win/lib/rlz_lib.h"
 
 class MockRlzSendFinancialPingFunction : public RlzSendFinancialPingFunction {
@@ skipping 26 matching lines @@
   // Before running the tests, clear the state of the RLZ products used.
   rlz_lib::AccessPoint access_points[] = {
     rlz_lib::GD_WEB_SERVER,
     rlz_lib::GD_OUTLOOK,
     rlz_lib::NO_ACCESS_POINT,
   };
   rlz_lib::ClearProductState(rlz_lib::PINYIN_IME, access_points);
   rlz_lib::ClearProductState(rlz_lib::DESKTOP, access_points);
 
   // Check that the state has really been cleared.
-  RegKey key(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\N",
-             KEY_READ);
+  base::win::RegKey key(HKEY_CURRENT_USER,
+                        L"Software\\Google\\Common\\Rlz\\Events\\N",
+                        KEY_READ);
   ASSERT_FALSE(key.Valid());
 
   key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D",
            KEY_READ);
   ASSERT_FALSE(key.Valid());
 
   // Mock out experimental.rlz.sendFinancialPing().
   ASSERT_TRUE(ExtensionFunctionDispatcher::OverrideFunction(
       "experimental.rlz.sendFinancialPing",
       MockRlzSendFinancialPingFunctionFactory));
@@ skipping 24 matching lines @@
   ASSERT_TRUE(key.ReadValueDW(L"D4I", &value));
   ASSERT_EQ(1, value);
 
   key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D",
            KEY_READ);
   ASSERT_FALSE(key.Valid());
 
   // Cleanup.
   rlz_lib::ClearProductState(rlz_lib::PINYIN_IME, access_points);
 }