Simplifying renderer focus management

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc	(revision 19803)
+++ chrome/renderer/render_view.cc	(working copy)
@@ -2151,21 +2151,9 @@
       }
     }
 
-    // TODO(jcampan): http://b/issue?id=1157486 Remove StoreForFocus call once
-    //                we have the fix for 792423.
-    search_frame->GetView()->StoreFocusForFrame(search_frame);
     webview()->SetFocusedFrame(search_frame);
   } while (!result && search_frame != focused_frame);
 
-  // Make sure we don't leave any frame focused or the focus won't be restored
-  // properly in WebViewImpl::SetFocus().  Note that we are talking here about
-  // focused on the SelectionController, not FocusController.
-  // webview()->GetFocusedFrame() will still return the last focused frame (as
-  // it queries the FocusController).
-  // TODO(jcampan): http://b/issue?id=1157486 Remove next line once we have the
-  //                fix for 792423.
-  webview()->SetFocusedFrame(NULL);
-
   if (options.findNext) {
     // Force the main_frame to report the actual count.
     main_frame->IncreaseMatchCount(0, request_id);