Remove UTF string conversion functions from the global namespace.

content/renderer/render_view_browsertest.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 "base/basictypes.h"
 
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
@@ skipping 51 matching lines @@
 #endif
 
 using blink::WebFrame;
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 using blink::WebRuntimeFeatures;
 using blink::WebString;
 using blink::WebTextDirection;
 using blink::WebURLError;
 
-namespace content  {
+namespace content {
 
 namespace {
 
 #if (defined(USE_AURA) && defined(USE_X11)) || defined(USE_OZONE)
 // Converts MockKeyboard::Modifiers to ui::EventFlags.
 int ConvertMockKeyboardModifier(MockKeyboard::Modifiers modifiers) {
   static struct ModifierMap {
     MockKeyboard::Modifiers src;
     int dst;
   } kModifierMap[] = {
@@ skipping 977 matching lines @@
         view()->OnSetInputMethodActive(ime_message->enable);
         break;
 
       case IME_SETFOCUS:
         // Update the window focus.
         view()->OnSetFocus(ime_message->enable);
         break;
 
       case IME_SETCOMPOSITION:
         view()->OnImeSetComposition(
-            WideToUTF16Hack(ime_message->ime_string),
+            base::WideToUTF16Hack(ime_message->ime_string),
             std::vector<blink::WebCompositionUnderline>(),
             ime_message->selection_start,
             ime_message->selection_end);
         break;
 
       case IME_CONFIRMCOMPOSITION:
         view()->OnImeConfirmComposition(
-            WideToUTF16Hack(ime_message->ime_string),
+            base::WideToUTF16Hack(ime_message->ime_string),
             gfx::Range::InvalidRange(),
             false);
         break;
 
       case IME_CANCELCOMPOSITION:
         view()->OnImeSetComposition(
             base::string16(),
             std::vector<blink::WebCompositionUnderline>(),
             0, 0);
         break;
     }
 
     // Update the status of our IME back-end.
     // TODO(hbono): we should verify messages to be sent from the back-end.
     view()->UpdateTextInputType();
     ProcessPendingMessages();
     render_thread_->sink().ClearMessages();
 
     if (ime_message->result) {
       // Retrieve the content of this page and compare it with the expected
       // result.
       const int kMaxOutputCharacters = 128;
-      std::wstring output = UTF16ToWideHack(
+      std::wstring output = base::UTF16ToWideHack(
           GetMainFrame()->contentAsText(kMaxOutputCharacters));
       EXPECT_EQ(output, ime_message->result);
     }
   }
 }
 
 // Test that the RenderView::OnSetTextDirection() function can change the text
 // direction of the selected input element.
 TEST_F(RenderViewImplTest, OnSetTextDirection) {
   // Load an HTML page consisting of a <textarea> element and a <div> element.
@@ skipping 28 matching lines @@
     ExecuteJavaScript("var result = document.getElementById('result');"
                       "var node = document.getElementById('test');"
                       "var style = getComputedStyle(node, null);"
                       "result.innerText ="
                       "    node.getAttribute('dir') + ',' +"
                       "    style.getPropertyValue('direction');");
 
     // Copy the document content to std::wstring and compare with the
     // expected result.
     const int kMaxOutputCharacters = 16;
-    std::wstring output = UTF16ToWideHack(
+    std::wstring output = base::UTF16ToWideHack(
         GetMainFrame()->contentAsText(kMaxOutputCharacters));
     EXPECT_EQ(output, kTextDirection[i].expected_result);
   }
 }
 
 // see http://crbug.com/238750
 #if defined(OS_WIN)
 #define MAYBE_OnHandleKeyboardEvent DISABLED_OnHandleKeyboardEvent
 #else
 #define MAYBE_OnHandleKeyboardEvent OnHandleKeyboardEvent
@@ skipping 359 matching lines @@
         base::string16 char_code;
         if (SendKeyEvent(layout, key_code, modifiers, &char_code) < 0)
           continue;
       }
     }
 
     // Retrieve the text in the test page and compare it with the expected
     // text created from a virtual-key code, a character code, and the
     // modifier-key status.
     const int kMaxOutputCharacters = 4096;
-    std::wstring output = UTF16ToWideHack(
+    std::wstring output = base::UTF16ToWideHack(
         GetMainFrame()->contentAsText(kMaxOutputCharacters));
     EXPECT_EQ(kLayouts[i].expected_result, output);
   }
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 // Crashy, http://crbug.com/53247.
 TEST_F(RenderViewImplTest, DISABLED_DidFailProvisionalLoadWithErrorForError) {
@@ skipping 447 matching lines @@
   nav_params.current_history_list_offset = 0;
   nav_params.pending_history_list_offset = 1;
   nav_params.page_id = -1;
   nav_params.frame_to_navigate = "frame";
   view()->OnNavigate(nav_params);
   ProcessPendingMessages();
 
   // Copy the document content to std::wstring and compare with the
   // expected result.
   const int kMaxOutputCharacters = 256;
-  std::wstring output = UTF16ToWideHack(
+  std::wstring output = base::UTF16ToWideHack(
       GetMainFrame()->contentAsText(kMaxOutputCharacters));
   EXPECT_EQ(output, L"hello \n\nworld");
 }
 
 // This test ensures that a RenderFrame object is created for the top level
 // frame in the RenderView.
 TEST_F(RenderViewImplTest, BasicRenderFrame) {
   EXPECT_TRUE(view()->main_render_frame_.get());
 }
 
@@ skipping 188 matching lines @@
   // made by some of Chrome's favicon handling.
   LoadHTML("<html>"
            "<head>"
            "</head>"
            "</html>");
   EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching(
       ViewHostMsg_UpdateFaviconURL::ID));
 }
 
 }  // namespace content