Remove UTF string conversion functions from the global namespace.

chrome/test/automation/tab_proxy.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/test/automation/tab_proxy.h"
 
 #include <algorithm>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
@@ skipping 42 matching lines @@
 
 int TabProxy::FindInPage(const std::wstring& search_string,
                          FindInPageDirection forward,
                          FindInPageCase match_case,
                          bool find_next,
                          int* ordinal) {
   if (!is_valid())
     return -1;
 
   AutomationMsg_Find_Params params;
-  params.search_string = WideToUTF16Hack(search_string);
+  params.search_string = base::WideToUTF16Hack(search_string);
   params.find_next = find_next;
   params.match_case = (match_case == CASE_SENSITIVE);
   params.forward = (forward == FWD);
 
   int matches = 0;
   int ordinal2 = 0;
   bool succeeded = sender_->Send(new AutomationMsg_Find(handle_,
                                                         params,
                                                         &ordinal2,
                                                         &matches));
@@ skipping 100 matching lines @@
     return false;
 
   DCHECK(root->IsType(base::Value::TYPE_LIST));
   base::Value* value = NULL;
   bool succeeded = static_cast<base::ListValue*>(root.get())->Get(0, &value);
   if (succeeded) {
     base::string16 read_value;
     succeeded = value->GetAsString(&read_value);
     if (succeeded) {
       // TODO(viettrungluu): remove conversion. (But should |jscript| be UTF-8?)
-      *string_value = UTF16ToWideHack(read_value);
+      *string_value = base::UTF16ToWideHack(read_value);
     }
   }
   return succeeded;
 }
 
 bool TabProxy::ExecuteAndExtractBool(const std::wstring& frame_xpath,
                                      const std::wstring& jscript,
                                      bool* bool_value) {
   scoped_ptr<base::Value> root(ExecuteAndExtractValue(frame_xpath, jscript));
   if (root == NULL)
@@ skipping 169 matching lines @@
 
 TabProxy::~TabProxy() {}
 
 void TabProxy::FirstObjectAdded() {
   AddRef();
 }
 
 void TabProxy::LastObjectRemoved() {
   Release();
 }