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

net/proxy/proxy_script_decider_unittest.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 <vector>
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 26 matching lines @@
  public:
   struct Rule {
     Rule(const GURL& url, int fetch_error, bool is_valid_script)
         : url(url),
           fetch_error(fetch_error),
           is_valid_script(is_valid_script) {
     }
 
     base::string16 text() const {
       if (is_valid_script)
-        return UTF8ToUTF16(url.spec() + "!FindProxyForURL");
+        return base::UTF8ToUTF16(url.spec() + "!FindProxyForURL");
       if (fetch_error == OK)
-        return UTF8ToUTF16(url.spec() + "!invalid-script");
+        return base::UTF8ToUTF16(url.spec() + "!invalid-script");
       return base::string16();
     }
 
     GURL url;
     int fetch_error;
     bool is_valid_script;
   };
 
   Rule AddSuccessRule(const char* url) {
     Rule rule(GURL(url), OK /*fetch_error*/, true);
@@ skipping 608 matching lines @@
 
 // All of the tests above that use ProxyScriptDecider have tested
 // failure to fetch a PAC file via DHCP configuration, so we now test
 // success at downloading and parsing, and then success at downloading,
 // failure at parsing.
 
 TEST(ProxyScriptDeciderTest, AutodetectDhcpSuccess) {
   Rules rules;
   RuleBasedProxyScriptFetcher fetcher(&rules);
   SynchronousSuccessDhcpFetcher dhcp_fetcher(
-      WideToUTF16(L"http://bingo/!FindProxyForURL"));
+      base::WideToUTF16(L"http://bingo/!FindProxyForURL"));
 
   ProxyConfig config;
   config.set_auto_detect(true);
 
   rules.AddSuccessRule("http://bingo/");
   rules.AddFailDownloadRule("http://wpad/wpad.dat");
 
   TestCompletionCallback callback;
   ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
   EXPECT_EQ(OK, decider.Start(
       config, base::TimeDelta(), true, callback.callback()));
   EXPECT_EQ(dhcp_fetcher.expected_text(),
             decider.script_data()->utf16());
 
   EXPECT_TRUE(decider.effective_config().has_pac_url());
   EXPECT_EQ(GURL("http://dhcppac/"), decider.effective_config().pac_url());
 }
 
 TEST(ProxyScriptDeciderTest, AutodetectDhcpFailParse) {
   Rules rules;
   RuleBasedProxyScriptFetcher fetcher(&rules);
   SynchronousSuccessDhcpFetcher dhcp_fetcher(
-      WideToUTF16(L"http://bingo/!invalid-script"));
+      base::WideToUTF16(L"http://bingo/!invalid-script"));
 
   ProxyConfig config;
   config.set_auto_detect(true);
 
   rules.AddFailParsingRule("http://bingo/");
   rules.AddFailDownloadRule("http://wpad/wpad.dat");
 
   TestCompletionCallback callback;
   ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
   // Since there is fallback to DNS-based WPAD, the final error will be that
@@ skipping 63 matching lines @@
 
   // Run the message loop to let the DHCP fetch complete and post the results
   // back. Before the fix linked to above, this would try to invoke on
   // the callback object provided by ProxyScriptDecider after it was
   // no longer valid.
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace
 }  // namespace net