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

net/proxy/proxy_resolver_script_data.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/proxy/proxy_resolver_script_data.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace net {
 
 // static
 scoped_refptr<ProxyResolverScriptData> ProxyResolverScriptData::FromUTF8(
     const std::string& utf8) {
   return new ProxyResolverScriptData(TYPE_SCRIPT_CONTENTS,
                                      GURL(),
-                                     UTF8ToUTF16(utf8));
+                                     base::UTF8ToUTF16(utf8));
 }
 
 // static
 scoped_refptr<ProxyResolverScriptData> ProxyResolverScriptData::FromUTF16(
     const base::string16& utf16) {
   return new ProxyResolverScriptData(TYPE_SCRIPT_CONTENTS, GURL(), utf16);
 }
 
 // static
 scoped_refptr<ProxyResolverScriptData> ProxyResolverScriptData::FromURL(
@@ skipping 39 matching lines @@
                                                  const GURL& url,
                                                  const base::string16& utf16)
     : type_(type),
       url_(url),
       utf16_(utf16) {
 }
 
 ProxyResolverScriptData::~ProxyResolverScriptData() {}
 
 }  // namespace net