Move most importer code to chrome/utility/importer

android_webview/tools/third_party_files_whitelist.txt

Index: android_webview/tools/third_party_files_whitelist.txt
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt
index 3c7cc0a5bb3a1745ef9514c8d64394af261d5fe5..bc5ad883615851d9b6abe073f4279bb8bb7e9ed5 100644
--- a/android_webview/tools/third_party_files_whitelist.txt
+++ b/android_webview/tools/third_party_files_whitelist.txt
@@ -20,8 +20,6 @@ base/md5.cc
 # license. This third-party code is taken from Mozilla, the license for which
 # we already pick up from third_party/npapi/.
 chrome/browser/download/download_extensions.cc
-# String 'copyright' used in code.
-chrome/browser/importer/firefox_importer_utils.cc
 # Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
 # license. Not used on Android.
 chrome/browser/importer/firefox_profile_lock.cc
@@ -34,18 +32,6 @@ chrome/browser/importer/firefox_profile_lock_posix.cc
 # Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
 # license. Not used on Android.
 chrome/browser/importer/firefox_profile_lock_win.cc
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor.cc
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor_mac.h
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor_system_nss.cc
-# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
-# license. Not used on Android.
-chrome/browser/importer/nss_decryptor_win.h
 # Credits notice for ChromeOS.
 chrome/browser/resources/chromeos/about_os_credits.html
 # String 'copyright' used in code.
@@ -60,6 +46,20 @@ chrome/browser/resources/file_manager/js/media/mediaplayer_scripts.js
 chrome/browser/resources/file_manager/js/media/video_player_scripts.js
 # String 'copyright' used in code.
 chrome/browser/resources/file_manager/js/photo/photo_import_scripts.js
+# String 'copyright' used in code.
+chrome/common/importer/firefox_importer_utils.cc
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor.cc
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor_mac.h
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor_system_nss.cc
+# Copyright Netscape Communications Corporation; MPL, GPL v2 or LGPL v2
+# license. Not used on Android.
+chrome/utility/importer/nss_decryptor_win.h
 # Copyright Google Inc; no license. Example code only.
 chrome_frame/cfinstall/examples/jquery.html
 # Copyright Google Inc; no license. Example code only.