Added a system caret used for accessibility on Windows.

content/browser/renderer_host/legacy_render_widget_host_win.cc

Index: content/browser/renderer_host/legacy_render_widget_host_win.cc
diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.cc b/content/browser/renderer_host/legacy_render_widget_host_win.cc
index c93a6f33fd9d805a16402a9b354a6ffb7b19a3fe..308bde420731498d391b654bb96abdf7616a0150 100644
--- a/content/browser/renderer_host/legacy_render_widget_host_win.cc
+++ b/content/browser/renderer_host/legacy_render_widget_host_win.cc
@@ -5,7 +5,6 @@
 #include "content/browser/renderer_host/legacy_render_widget_host_win.h"
 
 #include <memory>
-#include <utility>
 
 #include "base/command_line.h"
 #include "base/win/win_util.h"
@@ -16,7 +15,6 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/public/common/content_switches.h"
-#include "ui/accessibility/platform/ax_fake_caret_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/internal_constants.h"
 #include "ui/base/win/window_event_target.h"
@@ -87,11 +85,6 @@ void LegacyRenderWidgetHostHWND::SetBounds(const gfx::Rect& bounds) {
     direct_manipulation_helper_->SetBounds(bounds_in_pixel);
 }
 
-void LegacyRenderWidgetHostHWND::MoveCaretTo(const gfx::Rect& bounds) {
-  DCHECK(ax_fake_caret_);
-  ax_fake_caret_->MoveCaretTo(bounds);
-}
-
 void LegacyRenderWidgetHostHWND::OnFinalMessage(HWND hwnd) {
   if (host_) {
     host_->OnLegacyWindowDestroyed();
@@ -105,15 +98,11 @@ void LegacyRenderWidgetHostHWND::OnFinalMessage(HWND hwnd) {
 }
 
 LegacyRenderWidgetHostHWND::LegacyRenderWidgetHostHWND(HWND parent)
-    : mouse_tracking_enabled_(false), host_(nullptr) {
+    : mouse_tracking_enabled_(false), host_(NULL) {
   RECT rect = {0};
   Base::Create(parent, rect, L"Chrome Legacy Window",
                WS_CHILDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
                WS_EX_TRANSPARENT);
-  // We create the fake caret regardless of accessibility mode since not all
-  // assistive software that makes use of a fake caret is classified as a screen
-  // reader, e.g. the built-in Windows Magnifier.
-  ax_fake_caret_ = std::make_unique<ui::AXFakeCaretWin>(hwnd());
 }
 
 LegacyRenderWidgetHostHWND::~LegacyRenderWidgetHostHWND() {
@@ -180,36 +169,24 @@ LRESULT LegacyRenderWidgetHostHWND::OnGetObject(UINT message,
     return static_cast<LRESULT>(0L);
   }
 
-  if (!host_)
+  if (static_cast<DWORD>(OBJID_CLIENT) != obj_id || !host_)
     return static_cast<LRESULT>(0L);
 
-  if (static_cast<DWORD>(OBJID_CLIENT) == obj_id) {
-    RenderWidgetHostImpl* rwhi =
-        RenderWidgetHostImpl::From(host_->GetRenderWidgetHost());
-    if (!rwhi)
-      return static_cast<LRESULT>(0L);
-
-    BrowserAccessibilityManagerWin* manager =
-        static_cast<BrowserAccessibilityManagerWin*>(
-            rwhi->GetRootBrowserAccessibilityManager());
-    if (!manager)
-      return static_cast<LRESULT>(0L);
-
-    base::win::ScopedComPtr<IAccessible> root(
-        ToBrowserAccessibilityWin(manager->GetRoot()));
-    return LresultFromObject(IID_IAccessible, w_param,
-                             static_cast<IAccessible*>(root.Detach()));
-  }
+  RenderWidgetHostImpl* rwhi =
+      RenderWidgetHostImpl::From(host_->GetRenderWidgetHost());
+  if (!rwhi)
+    return static_cast<LRESULT>(0L);
 
-  if (static_cast<DWORD>(OBJID_CARET) == obj_id && host_->HasFocus()) {
-    DCHECK(ax_fake_caret_);
-    base::win::ScopedComPtr<IAccessible> fake_caret_accessible =
-        ax_fake_caret_->GetCaret();
-    return LresultFromObject(IID_IAccessible, w_param,
-                             fake_caret_accessible.Detach());
-  }
+  BrowserAccessibilityManagerWin* manager =
+      static_cast<BrowserAccessibilityManagerWin*>(
+          rwhi->GetRootBrowserAccessibilityManager());
+  if (!manager)
+    return static_cast<LRESULT>(0L);
 
-  return static_cast<LRESULT>(0L);
+  base::win::ScopedComPtr<IAccessible> root(
+      ToBrowserAccessibilityWin(manager->GetRoot()));
+  return LresultFromObject(IID_IAccessible, w_param,
+                           static_cast<IAccessible*>(root.Detach()));
 }
 
 // We send keyboard/mouse/touch messages to the parent window via SendMessage.