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

chrome/test/plugin/plugin_test.cpp

 // 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.
 
 // Tests for the top plugins to catch regressions in our plugin host code, as
 // well as in the out of process code.  Currently this tests:
 //  Flash
 //  Real
 //  QuickTime
 //  Windows Media Player
@@ skipping 33 matching lines @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_list.h"
 
 #if defined(OS_WIN)
-#include "base/registry.h"
+#include "base/win/registry.h"
 #endif
 
 class PluginTest : public UITest {
  public:
   // Generate the URL for testing a particular test.
   // HTML for the tests is all located in test_directory\plugin\<testcase>
   // Set |mock_http| to true to use mock HTTP server.
   static GURL GetTestUrl(const std::string &test_case, bool mock_http) {
     static const FilePath::CharType kPluginPath[] = FILE_PATH_LITERAL("plugin");
     if (mock_http) {
       FilePath plugin_path = FilePath(kPluginPath).AppendASCII(test_case);
       return URLRequestMockHTTPJob::GetMockUrl(plugin_path);
     }
 
     FilePath path;
     PathService::Get(chrome::DIR_TEST_DATA, &path);
     path = path.Append(kPluginPath).AppendASCII(test_case);
     return net::FilePathToFileURL(path);
   }
 
  protected:
 #if defined(OS_WIN)
   virtual void SetUp() {
     const testing::TestInfo* const test_info =
         testing::UnitTest::GetInstance()->current_test_info();
     if (strcmp(test_info->name(), "MediaPlayerNew") == 0) {
       // The installer adds our process names to the registry key below.  Since
       // the installer might not have run on this machine, add it manually.
-      RegKey regkey;
+      base::win::RegKey regkey;
       if (regkey.Open(HKEY_LOCAL_MACHINE,
                       L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList",
                       KEY_WRITE)) {
         regkey.CreateKey(L"CHROME.EXE", KEY_READ);
       }
     } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) {
       // When testing the old WMP plugin, we need to force Chrome to not load
       // the new plugin.
       launch_arguments_.AppendSwitch(kUseOldWMPPluginSwitch);
     } else if (strcmp(test_info->name(), "FlashSecurity") == 0) {
@@ skipping 203 matching lines @@
 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) {
   MessageLoop loop(MessageLoop::TYPE_IO);
   Start();
   loop.Run();
 
   EXPECT_TRUE(success());
   EXPECT_TRUE(initial_download_path().BaseName().value() ==
               final_download_path().BaseName().value());
 }
 #endif  // defined(OS_WIN)