Introduce IEImporterTestRegistryOverrider to be able to override the registry for a test and flag t…

chrome/browser/importer/ie_importer_browsertest_win.cc

 // Copyright (c) 2013 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.
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <shlguid.h>
 #include <urlhist.h>
@@ skipping 12 matching lines @@
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/ie_importer.h"
+#include "chrome/browser/importer/ie_importer_test_registry_overrider_win.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/importer_unittest_utils.h"
 #include "chrome/browser/importer/pstore_declarations.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/common/password_form.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-const char16 kUnitTestRegistrySubKey[] = L"SOFTWARE\\Chromium Unit Tests";
-const char16 kUnitTestUserOverrideSubKey[] =
-    L"SOFTWARE\\Chromium Unit Tests\\HKCU Override";
-
 const BookmarkInfo kIEBookmarks[] = {
   {true, 2, {L"Links", L"SubFolderOfLinks"},
    L"SubLink",
    "http://www.links-sublink.com/"},
   {true, 1, {L"Links"},
    L"TheLink",
    "http://www.links-thelink.com/"},
   {false, 0, {},
    L"Google Home Page",
    "http://www.google.com/"},
@@ skipping 346 matching lines @@
 };
 
 }  // namespace
 
 // These tests need to be browser tests in order to be able to run the OOP
 // import (via ExternalProcessImporterHost) which launches a utility process.
 class IEImporterBrowserTest : public InProcessBrowserTest {
  protected:
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    StartRegistryOverride();
+
+    // Turn the override on for this process and flag child processes that they
+    // should do so as well.
+    ASSERT_TRUE(test_registry_overrider_.SetRegistryOverride());
 
     // This will launch the browser test and thus needs to happen last.
     InProcessBrowserTest::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
-    EndRegistryOverride();
-  }
-
-  void StartRegistryOverride() {
-    EXPECT_EQ(ERROR_SUCCESS, RegOverridePredefKey(HKEY_CURRENT_USER, NULL));
-    temp_hkcu_hive_key_.Create(HKEY_CURRENT_USER,
-                               kUnitTestUserOverrideSubKey,
-                               KEY_ALL_ACCESS);
-    EXPECT_TRUE(temp_hkcu_hive_key_.Valid());
-    EXPECT_EQ(ERROR_SUCCESS,
-              RegOverridePredefKey(HKEY_CURRENT_USER,
-                                   temp_hkcu_hive_key_.Handle()));
-  }
-
-  void EndRegistryOverride() {
-    EXPECT_EQ(ERROR_SUCCESS, RegOverridePredefKey(HKEY_CURRENT_USER, NULL));
-    temp_hkcu_hive_key_.Close();
-    base::win::RegKey key(HKEY_CURRENT_USER, kUnitTestRegistrySubKey,
-                          KEY_ALL_ACCESS);
-    key.DeleteKey(L"");
-  }
-
   base::ScopedTempDir temp_dir_;
-  base::win::RegKey temp_hkcu_hive_key_;
+  IEImporterTestRegistryOverrider test_registry_overrider_;
 };
 
 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IEImporter) {
   // Sets up a favorites folder.
   base::FilePath path = temp_dir_.path().AppendASCII("Favorites");
   CreateDirectory(path.value().c_str(), NULL);
   CreateDirectory(path.AppendASCII("SubFolder").value().c_str(), NULL);
   base::FilePath links_path = path.AppendASCII("Links");
   CreateDirectory(links_path.value().c_str(), NULL);
   CreateDirectory(links_path.AppendASCII("SubFolderOfLinks").value().c_str(),
@@ skipping 53 matching lines @@
   // Deletes itself.
   // TODO(gab): Use ExternalProcessImporterHost on Windows.
   ImporterHost* host = new ImporterHost;
   TestObserver* observer = new TestObserver();
   host->SetObserver(observer);
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_IE;
   source_profile.source_path = temp_dir_.path();
 
-  // IUrlHistoryStg2::AddUrl seems to reset the override. Ensure it here.
-  StartRegistryOverride();
-
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
       observer);
   MessageLoop::current()->Run();
 
   // Cleans up.
   url_history_stg2->DeleteUrl(kIEIdentifyUrl, 0);
   url_history_stg2.Release();
@@ skipping 65 matching lines @@
     source_profile.source_path = temp_dir_.path();
 
     host->StartImportSettings(
         source_profile,
         browser()->profile(),
         importer::FAVORITES,
         observer);
     MessageLoop::current()->Run();
   }
 }