Move UTF16ToASCII, remove WideToASCII.

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/bind.h"
 #include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 2110 matching lines @@
   // but won't complete synchronously.
   FrameMsg_Navigate_Params params;
   params.page_id = -1;
   params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   params.url = GURL("data:text/html,test data");
   frame()->OnNavigate(params);
 
   // An error occurred.
   view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
   const int kMaxOutputCharacters = 22;
-  EXPECT_EQ("", UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
+  EXPECT_EQ("",
+            base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
 }
 
 #if defined(OS_ANDROID)
 // Crashing on Android: http://crbug.com/311341
 #define MAYBE_DoesNotSuppress DISABLED_DoesNotSuppress
 #else
 #define MAYBE_DoesNotSuppress DoesNotSuppress
 #endif
 
 TEST_F(SuppressErrorPageTest, MAYBE_DoesNotSuppress) {
   WebURLError error;
   error.domain = WebString::fromUTF8(net::kErrorDomain);
   error.reason = net::ERR_FILE_NOT_FOUND;
   error.unreachableURL = GURL("http://example.com/dont-suppress");
   WebFrame* web_frame = GetMainFrame();
 
   // Start a load that will reach provisional state synchronously,
   // but won't complete synchronously.
   FrameMsg_Navigate_Params params;
   params.page_id = -1;
   params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   params.url = GURL("data:text/html,test data");
   frame()->OnNavigate(params);
 
   // An error occurred.
   view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
   ProcessPendingMessages();
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("A suffusion of yellow.",
-            UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
+            base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
 }
 
 // Tests if IME API's candidatewindow* events sent from browser are handled
 // in renderer.
 TEST_F(RenderViewImplTest, SendCandidateWindowEvents) {
   // Sends an HTML with an <input> element and scripts to the renderer.
   // The script handles all 3 of candidatewindow* events for an
   // InputMethodContext object and once it received 'show', 'update', 'hide'
   // should appear in the result div.
   LoadHTML("<input id='test'>"
@@ skipping 150 matching lines @@
   request.setTargetType(blink::WebURLRequest::TargetIsSubresource);
   blink::WebURLResponse redirect_response;
   frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);
   extra_data = static_cast<RequestExtraData*>(request.extraData());
   ASSERT_TRUE(extra_data);
   EXPECT_EQ(extra_data->service_worker_provider_id(),
             provider->provider_id());
 }
 
 }  // namespace content