Revert 66784 - Converts usage of SetProp/GetProp to a map. Even after making ...

views/accessibility/view_accessibility.cc

 // Copyright (c) 2010 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 "views/accessibility/view_accessibility.h"
 
-#include "app/view_prop.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_win.h"
 
-const char kViewsNativeHostPropForAccessibility[] =
-    "Views_NativeViewHostHWNDForAccessibility";
+const wchar_t kViewsNativeHostPropForAccessibility[] =
+  L"Views_NativeViewHostHWNDForAccessibility";
 
 // static
 scoped_refptr<ViewAccessibility> ViewAccessibility::Create(views::View* view) {
   CComObject<ViewAccessibility>* instance = NULL;
   HRESULT hr = CComObject<ViewAccessibility>::CreateInstance(&instance);
   DCHECK(SUCCEEDED(hr));
   instance->set_view(view);
   return scoped_refptr<ViewAccessibility>(instance);
 }
 
@@ skipping 681 matching lines @@
     msaa_state |= STATE_SYSTEM_UNAVAILABLE;
   return msaa_state;
 }
 
 // static
 HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
     views::NativeViewHost* native_host, IAccessible** accessible) {
   if (!native_host || !accessible)
     return E_INVALIDARG;
 
-  HWND native_view_window = static_cast<HWND>(
-      app::ViewProp::GetValue(native_host->native_view(),
-                              kViewsNativeHostPropForAccessibility));
+  HWND native_view_window =
+      static_cast<HWND>(GetProp(native_host->native_view(),
+                                kViewsNativeHostPropForAccessibility));
   if (!IsWindow(native_view_window)) {
     native_view_window = native_host->native_view();
   }
 
   return GetNativeIAccessibleInterface(native_view_window, accessible);
 }
 
 // static
 HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
     HWND native_view_window , IAccessible** accessible) {
   if (IsWindow(native_view_window)) {
     LRESULT ret = SendMessage(native_view_window, WM_GETOBJECT, 0,
                               OBJID_CLIENT);
     return ObjectFromLresult(ret, IID_IDispatch, 0,
                              reinterpret_cast<void**>(accessible));
   }
 
   return E_FAIL;
 }