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

chrome/browser/rlz/rlz_unittest.cc

 // Copyright (c) 2006-2008 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/rlz/rlz.h"
 
-#include "base/registry.h"
 #include "base/path_service.h"
+#include "base/win/registry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::win::RegKey;
+
 namespace {
+
 // Gets rid of registry leftovers from testing. Returns false if there
 // is nothing to clean.
 bool CleanValue(const wchar_t* key_name, const wchar_t* value) {
   RegKey key;
   if (!key.Open(HKEY_CURRENT_USER, key_name, KEY_READ | KEY_WRITE))
     return false;
   EXPECT_TRUE(key.DeleteValue(value));
   return true;
 }
 
@@ skipping 30 matching lines @@
       rlz_lib::CHROME_OMNIBOX, rlz_lib::FIRST_SEARCH));
   const wchar_t kEvent1[] = L"C1F";
   RegKey key1;
   EXPECT_TRUE(key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
   EXPECT_TRUE(key1.ReadValueDW(kEvent1, &recorded_value));
   EXPECT_EQ(1, recorded_value);
 
   EXPECT_TRUE(RLZTracker::ClearAllProductEvents(rlz_lib::CHROME));
   EXPECT_FALSE(CleanValue(kKeyName, kEvent1));
 }