Fix password import for OS X Firefox....

chrome/browser/importer/profile_writer.cc

 // Copyright (c) 2010 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 "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/importer/importer.h"
+#include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 
 using webkit_glue::PasswordForm;
 
 bool ProfileWriter::BookmarkModelIsLoaded() const {
   return profile_->GetBookmarkModel()->IsLoaded();
 }
 
 bool ProfileWriter::TemplateURLModelIsLoaded() const {
   return profile_->GetTemplateURLModel()->loaded();
 }
 
 void ProfileWriter::AddPasswordForm(const PasswordForm& form) {
-  profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)->AddLogin(form);
+  profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS)->AddLogin(form);
 }
 
 #if defined(OS_WIN)
 void ProfileWriter::AddIE7PasswordInfo(const IE7PasswordInfo& info) {
   profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)->AddIE7Login(info);
 }
 #endif
 
 void ProfileWriter::AddHistoryPage(const std::vector<history::URLRow>& page) {
   profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->
@@ skipping 299 matching lines @@
          ((!import_to_bookmark_bar || !entry.in_toolbar) &&
            parent != model->other_node()))) {
       found_match = false;
     }
 
     if (found_match)
       return true;  // Found a match with the same url path and title.
   }
   return false;
 }