Update from https://crrev.com/303153

net/http/url_security_manager_win.cc

 // Copyright (c) 2011 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 "net/http/url_security_manager.h"
 
 #include <urlmon.h>
 #pragma comment(lib, "urlmon.lib")
 
 #include "base/strings/string_util.h"
@@ skipping 35 matching lines @@
 URLSecurityManagerWin::URLSecurityManagerWin(
     const HttpAuthFilter* whitelist_delegate)
     : whitelist_delegate_(whitelist_delegate) {
 }
 
 bool URLSecurityManagerWin::CanUseDefaultCredentials(
     const GURL& auth_origin) const {
   if (!const_cast<URLSecurityManagerWin*>(this)->EnsureSystemSecurityManager())
     return false;
 
-  std::wstring url_w = base::ASCIIToWide(auth_origin.spec());
+  base::string16 url16 = base::ASCIIToUTF16(auth_origin.spec());
   DWORD policy = 0;
   HRESULT hr;
-  hr = security_manager_->ProcessUrlAction(url_w.c_str(),
+  hr = security_manager_->ProcessUrlAction(url16.c_str(),
                                            URLACTION_CREDENTIALS_USE,
                                            reinterpret_cast<BYTE*>(&policy),
                                            sizeof(policy), NULL, 0,
                                            PUAF_NOUI, 0);
   if (FAILED(hr)) {
     LOG(ERROR) << "IInternetSecurityManager::ProcessUrlAction failed: " << hr;
     return false;
   }
 
   // Four possible policies for URLACTION_CREDENTIALS_USE.  See the MSDN page
   // "About URL Security Zones" at
   // http://msdn.microsoft.com/en-us/library/ms537183(VS.85).aspx
   switch (policy) {
     case URLPOLICY_CREDENTIALS_SILENT_LOGON_OK:
       return true;
     case URLPOLICY_CREDENTIALS_CONDITIONAL_PROMPT: {
       // This policy means "prompt the user for permission if the resource is
       // not located in the Intranet zone".  TODO(wtc): Note that it's
       // prompting for permission (to use the default credentials), as opposed
       // to prompting the user to enter a user name and password.
 
       // URLZONE_LOCAL_MACHINE 0
       // URLZONE_INTRANET      1
       // URLZONE_TRUSTED       2
       // URLZONE_INTERNET      3
       // URLZONE_UNTRUSTED     4
       DWORD zone = 0;
-      hr = security_manager_->MapUrlToZone(url_w.c_str(), &zone, 0);
+      hr = security_manager_->MapUrlToZone(url16.c_str(), &zone, 0);
       if (FAILED(hr)) {
         LOG(ERROR) << "IInternetSecurityManager::MapUrlToZone failed: " << hr;
         return false;
       }
       return zone <= URLZONE_INTRANET;
     }
     case URLPOLICY_CREDENTIALS_MUST_PROMPT_USER:
       return false;
     case URLPOLICY_CREDENTIALS_ANONYMOUS_ONLY:
       // TODO(wtc): we should fail the authentication.
@@ skipping 30 matching lines @@
     const HttpAuthFilter* whitelist_default,
     const HttpAuthFilter* whitelist_delegate) {
   // If we have a whitelist, just use that.
   if (whitelist_default)
     return new URLSecurityManagerWhitelist(whitelist_default,
                                            whitelist_delegate);
   return new URLSecurityManagerWin(whitelist_delegate);
 }
 
 }  //  namespace net