Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media…

net/base/net_util_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 "net/base/net_util.h"
 
 #include <iphlpapi.h>
 #include <wlanapi.h>
 
 #include <algorithm>
@@ skipping 109 matching lines @@
       UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
 
   if (!IsStringUTF8(path)) {
     // Not UTF-8, assume encoding is native codepage and we're done. We know we
     // are giving the conversion function a nonempty string, and it may fail if
     // the given string is not in the current encoding and give us an empty
     // string back. We detect this and report failure.
     file_path_str = base::SysNativeMBToWide(path);
     return !file_path_str.empty();
   }
-  file_path_str.assign(UTF8ToWide(path));
+  file_path_str.assign(base::UTF8ToWide(path));
 
   // We used to try too hard and see if |path| made up entirely of
   // the 1st 256 characters in the Unicode was a zero-extended UTF-16.
   // If so, we converted it to 'Latin-1' and checked if the result was UTF-8.
   // If the check passed, we converted the result to UTF-8.
   // Otherwise, we treated the result as the native OS encoding.
   // However, that led to http://crbug.com/4619 and http://crbug.com/14153
   return true;
 }
 
@@ skipping 165 matching lines @@
     case dot11_phy_type_erp:
       return WIFI_PHY_LAYER_PROTOCOL_G;
     case dot11_phy_type_ht:
       return WIFI_PHY_LAYER_PROTOCOL_N;
     default:
       return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN;
   }
 }
 
 }  // namespace net