Implement support for importing favorites from Edge on Windows 10.

chrome/common/importer/ie_importer_test_registry_overrider_win.cc

Index: chrome/common/importer/ie_importer_test_registry_overrider_win.cc
diff --git a/chrome/common/importer/ie_importer_test_registry_overrider_win.cc b/chrome/common/importer/ie_importer_test_registry_overrider_win.cc
deleted file mode 100644
index e84cb6502476d378a1824a52e4cf3222445b19bc..0000000000000000000000000000000000000000
--- a/chrome/common/importer/ie_importer_test_registry_overrider_win.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// 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.
-
-#include "chrome/common/importer/ie_importer_test_registry_overrider_win.h"
-
-#include <windows.h>
-
-#include <string>
-
-#include "base/environment.h"
-#include "base/guid.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/win/registry.h"
-
-namespace {
-
-// The key to which a random subkey will be appended. This key itself will never
-// be deleted.
-const wchar_t kTestHKCUOverrideKeyPrefix[] = L"SOFTWARE\\Chromium Unit Tests\\";
-const char kTestHKCUOverrideEnvironmentVariable[] =
-    "IE_IMPORTER_TEST_OVERRIDE_HKCU";
-
-// Reads the environment variable set by a previous call to
-// SetTestRegistryOverride() into |key| if it exists and |key| is not NULL.
-// Returns true if the variable was successfully read.
-bool GetTestKeyFromEnvironment(base::string16* key) {
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  std::string value;
-  bool result = env->GetVar(kTestHKCUOverrideEnvironmentVariable, &value);
-  if (result)
-    *key = base::UTF8ToUTF16(value);
-  return result;
-}
-
-}  // namespace
-
-////////////////////////////////////////////////////////////////////////////////
-// IEImporterTestRegistryOverrider, public:
-
-IEImporterTestRegistryOverrider::IEImporterTestRegistryOverrider()
-    : temporary_key_(kTestHKCUOverrideKeyPrefix +
-                     base::UTF8ToUTF16(base::GenerateGUID())) {
-  DCHECK(!GetTestKeyFromEnvironment(NULL));
-
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  bool success = env->SetVar(kTestHKCUOverrideEnvironmentVariable,
-                             base::UTF16ToUTF8(temporary_key_));
-  DCHECK(success);
-}
-
-IEImporterTestRegistryOverrider::~IEImporterTestRegistryOverrider() {
-  base::win::RegKey reg_key(HKEY_CURRENT_USER, temporary_key_.c_str(),
-                            KEY_ALL_ACCESS);
-  DCHECK(reg_key.Valid());
-  reg_key.DeleteKey(L"");
-
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  bool success = env->UnSetVar(kTestHKCUOverrideEnvironmentVariable);
-  DCHECK(success);
-}
-
-// static
-base::string16 IEImporterTestRegistryOverrider::GetTestRegistryOverride() {
-  base::string16 key;
-  if (!GetTestKeyFromEnvironment(&key))
-    return base::string16();
-  return key;
-}