Convert string16 to base::string16 in content.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 317 matching lines @@
   // And then the mouse event is forwarded to WebKit, which dispatches it to the
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to NULL here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = NULL;
 }
 
 void RenderFrameImpl::SimulateImeSetComposition(
-    const string16& text,
+    const base::string16& text,
     const std::vector<blink::WebCompositionUnderline>& underlines,
     int selection_start,
     int selection_end) {
   render_view_->OnImeSetComposition(
       text, underlines, selection_start, selection_end);
 }
 
 void RenderFrameImpl::SimulateImeConfirmComposition(
-    const string16& text,
+    const base::string16& text,
     const gfx::Range& replacement_range) {
   render_view_->OnImeConfirmComposition(text, replacement_range, false);
 }
 
 
 void RenderFrameImpl::OnImeSetComposition(
-    const string16& text,
+    const base::string16& text,
     const std::vector<blink::WebCompositionUnderline>& underlines,
     int selection_start,
     int selection_end) {
   // When a PPAPI plugin has focus, we bypass WebKit.
   if (!IsPepperAcceptingCompositionEvents()) {
     pepper_composition_text_ = text;
   } else {
     // TODO(kinaba) currently all composition events are sent directly to
     // plugins. Use DOM event mechanism after WebKit is made aware about
     // plugins that support composition.
     // The code below mimics the behavior of WebCore::Editor::setComposition.
 
     // Empty -> nonempty: composition started.
     if (pepper_composition_text_.empty() && !text.empty())
-      focused_pepper_plugin_->HandleCompositionStart(string16());
+      focused_pepper_plugin_->HandleCompositionStart(base::string16());
     // Nonempty -> empty: composition canceled.
     if (!pepper_composition_text_.empty() && text.empty())
-      focused_pepper_plugin_->HandleCompositionEnd(string16());
+      focused_pepper_plugin_->HandleCompositionEnd(base::string16());
     pepper_composition_text_ = text;
     // Nonempty: composition is ongoing.
     if (!pepper_composition_text_.empty()) {
       focused_pepper_plugin_->HandleCompositionUpdate(
           pepper_composition_text_, underlines, selection_start,
           selection_end);
     }
   }
 }
 
 void RenderFrameImpl::OnImeConfirmComposition(
-    const string16& text,
+    const base::string16& text,
     const gfx::Range& replacement_range,
     bool keep_selection) {
   // When a PPAPI plugin has focus, we bypass WebKit.
   // Here, text.empty() has a special meaning. It means to commit the last
   // update of composition text (see
   // RenderWidgetHost::ImeConfirmComposition()).
-  const string16& last_text = text.empty() ? pepper_composition_text_ : text;
+  const base::string16& last_text = text.empty() ? pepper_composition_text_
+                                                 : text;
 
   // last_text is empty only when both text and pepper_composition_text_ is.
   // Ignore it.
   if (last_text.empty())
     return;
 
   if (!IsPepperAcceptingCompositionEvents()) {
     base::i18n::UTF16CharIterator iterator(&last_text);
     int32 i = 0;
     while (iterator.Advance()) {
@@ skipping 893 matching lines @@
 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) {
   observer->RenderFrameGone();
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace content