Revert 49984 - patch from issue 2762014

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // 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 "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
@@ skipping 860 matching lines @@
   model_->OnControlKeyChanged(pressed);
 }
 
 void AutocompleteEditViewMac::FocusLocation(bool select_all) {
   if ([field_ isEditable]) {
     // If the text field has a field editor, it's the first responder, meaning
     // that it's already focused. makeFirstResponder: will select all, so only
     // call it if this behavior is desired.
     if (select_all || ![field_ currentEditor])
       [[field_ window] makeFirstResponder:field_];
-// FIXME
-    DCHECK_EQ((id)[field_ currentEditor], (id)[[field_ window] firstResponder]);
+    DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
   }
 }
 
 // TODO(shess): Copied from autocomplete_edit_view_win.cc.  Could this
 // be pushed into the model?
 std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) {
   // autocomplete_edit_view_win.cc assumes this can never happen, we
   // will too.
   DCHECK(clipboard);
 
@@ skipping 30 matching lines @@
   }
 
   return std::wstring();
 }
 
 // static
 NSFont* AutocompleteEditViewMac::GetFieldFont() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetFont(ResourceBundle::BaseFont).nativeFont();
 }