Revert 184352

chrome/browser/password_manager/password_store_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/browser/password_manager/password_store_win.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 70 matching lines @@
     web_data_service_->CancelRequest(i->first);
     delete i->second.form;
   }
 }
 
 void PasswordStoreWin::DBHandler::GetIE7Login(
     const PasswordForm& form,
     const PasswordStoreWin::ConsumerCallbackRunner& callback_runner) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   IE7PasswordInfo info;
-  info.url_hash =
-      ie7_password::GetUrlHash(base::UTF8ToWide(form.origin.spec()));
+  info.url_hash = ie7_password::GetUrlHash(UTF8ToWide(form.origin.spec()));
   WebDataService::Handle handle = web_data_service_->GetIE7Login(info, this);
   pending_requests_[handle] =
       RequestInfo(new PasswordForm(form), callback_runner);
 }
 
 PasswordForm* PasswordStoreWin::DBHandler::GetIE7Result(
     const WDTypedResult *result,
     const PasswordForm& form) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   const WDResult<IE7PasswordInfo>* r =
       static_cast<const WDResult<IE7PasswordInfo>*>(result);
   IE7PasswordInfo info = r->GetValue();
 
   if (!info.encrypted_data.empty()) {
     // We got a result.
     // Delete the entry. If it's good we will add it to the real saved password
     // table.
     web_data_service_->RemoveIE7Login(info);
     std::wstring username;
     std::wstring password;
-    std::wstring url = base::ASCIIToWide(form.origin.spec());
+    std::wstring url = ASCIIToWide(form.origin.spec());
     if (!ie7_password::DecryptPassword(url, info.encrypted_data,
                                        &username, &password)) {
       return NULL;
     }
 
     PasswordForm* autofill = new PasswordForm(form);
     autofill->username_value = username;
     autofill->password_value = password;
     autofill->preferred = true;
     autofill->ssl_valid = form.origin.SchemeIsSecure();
@@ skipping 73 matching lines @@
 }
 
 void PasswordStoreWin::GetLoginsImpl(
     const PasswordForm& form,
     const ConsumerCallbackRunner& callback_runner) {
   ConsumerCallbackRunner get_ie7_login =
       base::Bind(&PasswordStoreWin::GetIE7LoginIfNecessary,
                  this, form, callback_runner);
   PasswordStoreDefault::GetLoginsImpl(form, get_ie7_login);
 }