Issue 7044: Do not import cookies from Chrome and Firefox.

Note: we do not import cookies from Safari, so nothing to disable.
brave · Dec 11, 2019 · 0b1a2da · 0b1a2da
1 parent b6c4e72
commit 0b1a2da
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 275 deletions.
diff --git a/chromium_src/chrome/utility/importer/importer_creator.cc b/chromium_src/chrome/utility/importer/importer_creator.cc
@@ -1,18 +1,20 @@
+/* Copyright 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include "chrome/utility/importer/importer_creator.h"
 #define CreateImporterByType CreateImporterByType_ChromiumImpl
 #include "../../../../../chrome/utility/importer/importer_creator.cc"
 #undef CreateImporterByType
 
 #include "brave/utility/importer/brave_importer.h"
 #include "brave/utility/importer/chrome_importer.h"
-#include "brave/utility/importer/firefox_importer.h"
 
 namespace importer {
 
 scoped_refptr<Importer> CreateImporterByType(ImporterType type) {
   switch (type) {
-    case TYPE_FIREFOX:
-      return new brave::FirefoxImporter();
     case TYPE_CHROME:
       return new ChromeImporter();
     case TYPE_BRAVE:

diff --git a/common/importer/chrome_importer_utils.cc b/common/importer/chrome_importer_utils.cc
@@ -66,17 +66,13 @@ bool ChromeImporterCanImport(const base::FilePath& profile,
     profile.Append(base::FilePath::StringType(FILE_PATH_LITERAL("History")));
   base::FilePath passwords =
     profile.Append(base::FilePath::StringType(FILE_PATH_LITERAL("Login Data")));
-  base::FilePath cookies =
-    profile.Append(base::FilePath::StringType(FILE_PATH_LITERAL("Cookies")));
 
   if (base::PathExists(bookmarks))
     *services_supported |= importer::FAVORITES;
   if (base::PathExists(history))
     *services_supported |= importer::HISTORY;
   if (base::PathExists(passwords))
     *services_supported |= importer::PASSWORDS;
-  if (base::PathExists(cookies))
-    *services_supported |= importer::COOKIES;
 
   return *services_supported != importer::NONE;
 }
diff --git a/patches/chrome-browser-importer-importer_list.cc.patch b/patches/chrome-browser-importer-importer_list.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
-index da4c6f6cec37523f59fd6b18e9e1c603c8e6a0df..f613af5207e550b91fb878d7fe56204fbdaecbc7 100644
+index da4c6f6cec37523f59fd6b18e9e1c603c8e6a0df..569bb3a108132454c2213ece7abcb4ff23fcbc3c 100644
 --- a/chrome/browser/importer/importer_list.cc
 +++ b/chrome/browser/importer/importer_list.cc
 @@ -29,6 +29,9 @@
@@ -28,15 +28,7 @@ index da4c6f6cec37523f59fd6b18e9e1c603c8e6a0df..f613af5207e550b91fb878d7fe56204f
    if (profile_path.empty())
      return;
 
-@@ -127,6 +135,7 @@ void DetectFirefoxProfiles(const std::string locale,
-     firefox.app_path = app_path;
-   firefox.services_supported = importer::HISTORY | importer::FAVORITES |
-                                importer::PASSWORDS | importer::SEARCH_ENGINES |
-+                               importer::COOKIES |
-                                importer::AUTOFILL_FORM_DATA;
-   firefox.locale = locale;
-   profiles->push_back(firefox);
-@@ -145,21 +154,37 @@ std::vector<importer::SourceProfile> DetectSourceProfilesWorker(
+@@ -145,21 +153,37 @@ std::vector<importer::SourceProfile> DetectSourceProfilesWorker(
  #if defined(OS_WIN)
    if (shell_integration::IsFirefoxDefaultBrowser()) {
      DetectFirefoxProfiles(locale, &profiles);

diff --git a/patches/chrome-utility-importer-firefox_importer.cc.patch b/patches/chrome-utility-importer-firefox_importer.cc.patch
diff --git a/patches/chrome-utility-importer-firefox_importer.h.patch b/patches/chrome-utility-importer-firefox_importer.h.patch
diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -171,7 +171,6 @@ test("brave_unit_tests") {
       "../browser/importer/chrome_profile_lock_unittest.cc",
       "../utility/importer/chrome_importer_unittest.cc",
       "../utility/importer/brave_importer_unittest.cc",
-      "../utility/importer/firefox_importer_unittest.cc",
 
       # These tests should probably work on Android and compile, but don't pass currently
       "//brave/browser/autocomplete/brave_autocomplete_provider_client_unittest.cc",

diff --git a/utility/BUILD.gn b/utility/BUILD.gn
@@ -30,8 +30,6 @@ source_set("utility") {
       "importer/brave_importer.h",
       "importer/chrome_importer.cc",
       "importer/chrome_importer.h",
-      "importer/firefox_importer.cc",
-      "importer/firefox_importer.h",
     ]
 
     deps += [

diff --git a/utility/importer/chrome_importer.cc b/utility/importer/chrome_importer.cc
@@ -86,11 +86,7 @@ void ChromeImporter::StartImport(const importer::SourceProfile& source_profile,
     bridge_->NotifyItemEnded(importer::PASSWORDS);
   }
 
-  if ((items & importer::COOKIES) && !cancelled()) {
-    bridge_->NotifyItemStarted(importer::COOKIES);
-    ImportCookies();
-    bridge_->NotifyItemEnded(importer::COOKIES);
-  }
+  // Note that we do not import cookies from Chrome (issues/7044).
 
   bridge_->NotifyEnded();
 }

diff --git a/utility/importer/firefox_importer.cc b/utility/importer/firefox_importer.cc
diff --git a/utility/importer/firefox_importer.h b/utility/importer/firefox_importer.h
diff --git a/utility/importer/firefox_importer_unittest.cc b/utility/importer/firefox_importer_unittest.cc