Merge 34145 - Reverts my r4300 and refixes Issue 3156 and 13500....

chrome/browser/autocomplete/autocomplete_edit_view_win.h

Index: chrome/browser/autocomplete/autocomplete_edit_view_win.h
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit_view_win.h	(revision 41252)
+++ chrome/browser/autocomplete/autocomplete_edit_view_win.h	(working copy)
@@ -176,6 +176,7 @@
     MSG_WM_RBUTTONDOWN(OnNonLButtonDown)
     MSG_WM_RBUTTONUP(OnNonLButtonUp)
     MSG_WM_SETFOCUS(OnSetFocus)
+    MSG_WM_SETTEXT(OnSetText)
     MSG_WM_SYSCHAR(OnSysChar)  // WM_SYSxxx == WM_xxx with ALT down
     MSG_WM_SYSKEYDOWN(OnKeyDown)
     MSG_WM_SYSKEYUP(OnKeyUp)
@@ -259,6 +260,7 @@
   void OnPaint(HDC bogus_hdc);
   void OnPaste();
   void OnSetFocus(HWND focus_wnd);
+  LRESULT OnSetText(const wchar_t* text);
   void OnSysChar(TCHAR ch, UINT repeat_count, UINT flags);
   void OnWindowPosChanging(WINDOWPOS* window_pos);