Converts usage of SetProp/GetProp to a map. Even after making sure we

views/focus/focus_util_win.h

Index: views/focus/focus_util_win.h
diff --git a/views/focus/focus_util_win.h b/views/focus/focus_util_win.h
index 2c53c68eca66a529b7797e13e347fe30114b4417..6394f5d53dfbc8b3f3271b48e191e2715961e49f 100644
--- a/views/focus/focus_util_win.h
+++ b/views/focus/focus_util_win.h
@@ -9,18 +9,16 @@
 #include <windows.h>
 
 namespace app {
-namespace win {
-class ScopedProp;
-}
+class ViewProp;
 }
 
 namespace views {
 
 // Marks the passed |hwnd| as supporting mouse-wheel message rerouting.
 // We reroute the mouse wheel messages to such HWND when they are under the
-// mouse pointer (but are not the active window). Callers must delete the
-// returned object before the window is destroyed (see ScopedProp for details).
-app::win::ScopedProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd);
+// mouse pointer (but are not the active window). Callers own the returned
+// object.
+app::ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd);
 
 // Forwards mouse wheel messages to the window under it.
 // Windows sends mouse wheel messages to the currently active window.