[refactor] Cleanup IME State in RenderWidgetHostViewMac which is already tracked by TextInputManager

content/browser/renderer_host/render_widget_host_view_aura.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_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1319 matching lines @@
 
 bool RenderWidgetHostViewAura::GetTextRange(gfx::Range* range) const {
   if (!text_input_manager_ || !GetFocusedWidget())
     return false;
 
   const TextInputManager::TextSelection* selection =
       text_input_manager_->GetTextSelection(GetFocusedWidget()->GetView());
   if (!selection)
     return false;
 
-  range->set_start(selection->offset);
-  range->set_end(selection->offset + selection->text.length());
+  range->set_start(selection->offset());
+  range->set_end(selection->offset() + selection->text().length());
   return true;
 }
 
 bool RenderWidgetHostViewAura::GetCompositionTextRange(
     gfx::Range* range) const {
   // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
   NOTIMPLEMENTED();
   return false;
 }
 
 bool RenderWidgetHostViewAura::GetSelectionRange(gfx::Range* range) const {
   if (!text_input_manager_ || !GetFocusedWidget())
     return false;
 
   const TextInputManager::TextSelection* selection =
       text_input_manager_->GetTextSelection(GetFocusedWidget()->GetView());
   if (!selection)
     return false;
 
-  range->set_start(selection->range.start());
-  range->set_end(selection->range.end());
+  range->set_start(selection->range().start());
+  range->set_end(selection->range().end());
   return true;
 }
 
 bool RenderWidgetHostViewAura::SetSelectionRange(const gfx::Range& range) {
   // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
   NOTIMPLEMENTED();
   return false;
 }
 
 bool RenderWidgetHostViewAura::DeleteRange(const gfx::Range& range) {
   // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
   NOTIMPLEMENTED();
   return false;
 }
 
 bool RenderWidgetHostViewAura::GetTextFromRange(
     const gfx::Range& range,
     base::string16* text) const {
   if (!text_input_manager_ || !GetFocusedWidget())
     return false;
 
   const TextInputManager::TextSelection* selection =
       text_input_manager_->GetTextSelection(GetFocusedWidget()->GetView());
   if (!selection)
     return false;
 
-  gfx::Range selection_text_range(selection->offset,
-                                  selection->offset + selection->text.length());
+  gfx::Range selection_text_range(
+      selection->offset(), selection->offset() + selection->text().length());
 
   if (!selection_text_range.Contains(range)) {
     text->clear();
     return false;
   }
   if (selection_text_range.EqualsIgnoringDirection(range)) {
     // Avoid calling substr whose performance is low.
-    *text = selection->text;
+    *text = selection->text();
   } else {
-    *text = selection->text.substr(range.GetMin() - selection->offset,
-                                   range.length());
+    *text = selection->text().substr(range.GetMin() - selection->offset(),
+                                     range.length());
   }
   return true;
 }
 
 void RenderWidgetHostViewAura::OnInputMethodChanged() {
   // TODO(wjmaclean): can host_ ever be null?
   if (!host_)
     return;
 
   // TODO(suzhe): implement the newly added “locale” property of HTML DOM
@@ skipping 937 matching lines @@
   // this case we should use TextSelection for |this| since RWHV for guest
   // forwards text selection information to its platform view.
   RenderWidgetHostViewBase* focused_view =
       is_guest_view_hack_ ? this : GetFocusedWidget()
                                        ? GetFocusedWidget()->GetView()
                                        : nullptr;
 
   if (!focused_view)
     return;
 
-  base::string16 selected_text;
-  if (GetTextInputManager()
-          ->GetTextSelection(focused_view)
-          ->GetSelectedText(&selected_text) &&
-      selected_text.length()) {
+  const TextInputManager::TextSelection* selection =
+      GetTextInputManager()->GetTextSelection(focused_view);
+  if (selection->selected_text().length()) {
     // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard.
     ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION);
-    clipboard_writer.WriteText(selected_text);
+    clipboard_writer.WriteText(selection->selected_text());
   }
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 void RenderWidgetHostViewAura::SetPopupChild(
     RenderWidgetHostViewAura* popup_child_host_view) {
   popup_child_host_view_ = popup_child_host_view;
   event_handler_->SetPopupChild(
       popup_child_host_view,
       popup_child_host_view ? popup_child_host_view->event_handler() : nullptr);
 }
 
 }  // namespace content