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

chrome_frame/test/perf/chrome_frame_perftest.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_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
 
 #include "chrome_tab.h"  // Generated from chrome_tab.idl.
 
 #include "base/event_trace_controller_win.h"
 #include "base/event_trace_consumer_win.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/trace_event_win.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/registry.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
 
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 
 const wchar_t kSilverlightControlKey[] =
@@ skipping 1045 matching lines @@
   RunStartupTest("creation_cold", "t", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  true /* important */, false);
 }
 
 // Attempt to evict the Flash control can fail on the buildbot as the dll
 // is marked read only. The test run is aborted if we fail to evict the file
 // from the cache. This could also fail if the Flash control is in use.
 // On Vista this could fail because of UAC
 TEST_F(FlashCreationTest, PerfCold) {
-  RegKey flash_key(HKEY_CLASSES_ROOT, kFlashControlKey, KEY_READ);
+  base::win::RegKey flash_key(HKEY_CLASSES_ROOT, kFlashControlKey, KEY_READ);
 
   std::wstring plugin_path;
   ASSERT_TRUE(flash_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath flash_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {flash_path};
 
   RunStartupTest("creation_cold", "t_flash", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false/* important */, true);
 }
 
 // This test would fail on Vista due to UAC or if the Silverlight control is
 // in use. The test run is aborted if we fail to evict the file from the cache.
 // Disabling this test as the Silverlight dll does not seem to get unloaded
 // correctly causing the attempt to evict the dll from the system cache to
 // fail.
 TEST_F(SilverlightCreationTest, DISABLED_PerfCold) {
-  RegKey silverlight_key(HKEY_CLASSES_ROOT, kSilverlightControlKey, KEY_READ);
+  base::win::RegKey silverlight_key(HKEY_CLASSES_ROOT, kSilverlightControlKey,
+                                    KEY_READ);
 
   std::wstring plugin_path;
   ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {silverlight_path};
 
   RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
@@ skipping 329 matching lines @@
   PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles,
                        "automationproviderconnect");
   PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles,
                        "externaltabnavigate");
   PrintPerfTestResults(renderer_main_monitor, kNumCycles,
                        "beginrenderermain");
 #ifdef NDEBUG
   PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage");
 #endif  // NDEBUG
 }