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

chrome/browser/importer/ie_importer.cc

Index: chrome/browser/importer/ie_importer.cc
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 6f055a53f4de0d151de05960a93e998c159bd5a5..bfcfd0164ddd9d344c3633e71059addf40c761a4 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -419,6 +419,14 @@ void IEImporter::StartImport(const importer::SourceProfile& source_profile,
   bridge_ = bridge;
   source_path_ = source_profile.source_path;
 
+  // If there is indication that an override is required, but we fail to set it,
+  // prefer returning early to running the test with whatever is in the real
+  // registry.
+  if (!test_registry_overrider_.StartRegistryOverrideIfNeeded()) {
+    NOTREACHED();
+    return;
+  }
+
   bridge_->NotifyStarted();
 
   if ((items & importer::HOME_PAGE) && !cancelled())