Remove 'using base::string16;' from base/strings/string16.h and remove temporary

content/browser/renderer_host/render_widget_host_view_android.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 "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 493 matching lines @@
   }
 }
 
 void RenderWidgetHostViewAndroid::OnStartContentIntent(
     const GURL& content_url) {
   if (content_view_core_)
     content_view_core_->StartContentIntent(content_url);
 }
 
 void RenderWidgetHostViewAndroid::OnSmartClipDataExtracted(
-    const string16& result) {
+    const base::string16& result) {
   // Custom serialization over IPC isn't allowed normally for security reasons.
   // Since this feature is only used in (single-process) WebView, there are no
   // security issues. Enforce that it's only called in single process mode.
   CHECK(RenderProcessHost::run_renderer_in_process());
   if (content_view_core_)
     content_view_core_->OnSmartClipDataExtracted(result);
 }
 
 void RenderWidgetHostViewAndroid::ImeCancelComposition() {
   ime_adapter_android_.CancelComposition();
@@ skipping 895 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content