Move Password specific webdata logic into passwords component.

chrome/browser/importer/profile_writer.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/browser/importer/profile_writer.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 13 matching lines @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 
 #if defined(OS_WIN)
-#include "chrome/browser/webdata/password_web_data_service_win.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
+#include "components/password_manager/core/browser/webdata/password_web_data_service_win.h"
 #endif
 
 namespace {
 
 // Generates a unique folder name. If |folder_name| is not unique, then this
 // repeatedly tests for '|folder_name| + (i)' until a unique name is found.
 base::string16 GenerateUniqueFolderName(BookmarkModel* model,
                                         const base::string16& folder_name) {
   // Build a set containing the bookmark bar folder names.
   std::set<base::string16> existing_folder_names;
@@ skipping 277 matching lines @@
 
     // Only add valid TemplateURLs to the model.
     if ((*i)->url_ref().IsValid(model->search_terms_data())) {
       model->Add(*i);  // Takes ownership.
       *i = NULL;  // Prevent the vector from deleting *i later.
     }
   }
 }
 
 ProfileWriter::~ProfileWriter() {}