Implement support for importing favorites from Edge on Windows 10.

chrome/utility/importer/ie_importer_win.cc

 // Copyright (c) 2012 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/utility/importer/ie_importer_win.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <shlobj.h>
 #include <urlhist.h>
@@ skipping 11 matching lines @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
+#include "chrome/common/importer/edge_importer_utils_win.h"
 #include "chrome/common/importer/ie_importer_utils_win.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/common/importer/importer_url_row.h"
 #include "chrome/common/importer/pstore_declarations.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/utility/importer/favicon_reencode.h"
 #include "components/autofill/core/common/password_form.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 371 matching lines @@
 const GUID IEImporter::kPStoreAutocompleteGUID = {
     0xe161255a, 0x37c3, 0x11d2,
     { 0xbc, 0xaa, 0x00, 0xc0, 0x4f, 0xd9, 0x29, 0xdb }
 };
 // {A79029D6-753E-4e27-B807-3D46AB1545DF}
 const GUID IEImporter::kUnittestGUID = {
     0xa79029d6, 0x753e, 0x4e27,
     { 0xb8, 0x7, 0x3d, 0x46, 0xab, 0x15, 0x45, 0xdf }
 };
 
-IEImporter::IEImporter() {
-}
+IEImporter::IEImporter() : edge_import_mode_(false) {}
 
 void IEImporter::StartImport(const importer::SourceProfile& source_profile,
                              uint16 items,
                              ImporterBridge* bridge) {
+  edge_import_mode_ = source_profile.importer_type == importer::TYPE_EDGE;
   bridge_ = bridge;
-  source_path_ = source_profile.source_path;
+
+  if (edge_import_mode_) {
+    // When using for Edge imports we only support Favorites.
+    DCHECK(items == importer::FAVORITES);

[Ilya Sherman, 2015/11/26 02:04:45]

nit: DCHECK_EQ

[forshaw, 2015/11/30 12:57:59]

Acknowledged.

+    // As coming from untrusted source ensure items is correct.
+    items = importer::FAVORITES;
+    source_path_ = importer::GetEdgeDataFilePath();

[Ilya Sherman, 2015/11/26 02:04:45]

Why isn't this just set on the SourceProfiler?

[forshaw, 2015/11/30 12:57:59]

Moved this to being initialized in importer_list.

+  }
+  if (!source_profile.source_path.empty())
+    source_path_ = source_profile.source_path;
 
   bridge_->NotifyStarted();
 
   if ((items & importer::HOME_PAGE) && !cancelled()) {
     bridge_->NotifyItemStarted(importer::HOME_PAGE);
     ImportHomepage();  // Doesn't have a UI item.
     bridge_->NotifyItemEnded(importer::HOME_PAGE);
   }
   // The order here is important!
   if ((items & importer::HISTORY) && !cancelled()) {
@@ skipping 30 matching lines @@
   FavoritesInfo info;
   if (!GetFavoritesInfo(&info))
     return;
 
   BookmarkVector bookmarks;
   favicon_base::FaviconUsageDataList favicons;
   ParseFavoritesFolder(info, &bookmarks, &favicons);
 
   if (!bookmarks.empty() && !cancelled()) {
     const base::string16& first_folder_name =
-        l10n_util::GetStringUTF16(IDS_BOOKMARK_GROUP_FROM_IE);
+        edge_import_mode_
+            ? l10n_util::GetStringUTF16(IDS_BOOKMARK_GROUP_FROM_EDGE)
+            : l10n_util::GetStringUTF16(IDS_BOOKMARK_GROUP_FROM_IE);
+
     bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
   if (!favicons.empty() && !cancelled())
     bridge_->SetFavicons(favicons);
 }
 
 void IEImporter::ImportHistory() {
   const std::string kSchemes[] = {url::kHttpScheme,
                                   url::kHttpsScheme,
                                   url::kFtpScheme,
@@ skipping 283 matching lines @@
   LONG result = keyDefault.ReadValue(kIEDefaultHomepage, &default_homepage_url);
   if (result == ERROR_SUCCESS && !default_homepage_url.empty()) {
     if (homepage.spec() == GURL(default_homepage_url).spec())
       return;
   }
   bridge_->AddHomePage(homepage);
 }
 
 bool IEImporter::GetFavoritesInfo(IEImporter::FavoritesInfo* info) {
   if (!source_path_.empty()) {
-    // Source path exists during testing.
+    // Source path exists during testing as well as importing from Edge.

[Ilya Sherman, 2015/11/26 02:04:45]

nit: "as well as importing" -> "as well as when importing"

[forshaw, 2015/11/30 12:57:59]

Acknowledged.

     info->path = source_path_;
     info->path = info->path.AppendASCII("Favorites");
     info->links_folder = L"Links";
     return true;
   }
 
   // IE stores the favorites in the Favorites under user profile's folder.
   wchar_t buffer[MAX_PATH];
   if (FAILED(SHGetFolderPath(NULL, CSIDL_FAVORITES, NULL,
                              SHGFP_TYPE_CURRENT, buffer)))
@@ skipping 85 matching lines @@
       relative_path.GetComponents(&entry.path);
 
     // Add the bookmark.
     if (!entry.path.empty() && entry.path[0] == info.links_folder) {
       // Bookmarks in the Link folder should be imported to the toolbar.
       entry.in_toolbar = true;
     }
     bookmarks->push_back(entry);
   }
 
-  // Reflect the menu order in IE.
-  SortBookmarksInIEOrder(this, bookmarks);
+  if (!edge_import_mode_) {
+    // Reflect the menu order in IE.
+    SortBookmarksInIEOrder(this, bookmarks);
+  }
 
   // Record favicon data.
   for (FaviconMap::iterator iter = favicon_map.begin();
        iter != favicon_map.end(); ++iter)
     favicons->push_back(iter->second);
 }
 
 int IEImporter::CurrentIEVersion() const {
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }