Fix bug where the autocomplete text was being overridden by the user-entered text.

chrome/browser/autocomplete/autocomplete_edit_view_mac.h

Index: chrome/browser/autocomplete/autocomplete_edit_view_mac.h
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h
index 5ec2d0f1422870fc4474604c62e734a07268345c..6c7ccfbad55e1b05e74c5adf3790237067a9e26d 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h
@@ -119,7 +119,16 @@ class AutocompleteEditViewMac : public AutocompleteEditView {
 
   // Update the field with |display_text| and highlight the host and
   // scheme (if it's an URL or URL-fragment).
-  void UpdateAndStyleText(const std::wstring& display_text);
+  void SetText(const std::wstring& display_text);
+
+  // Update the field with |display_text| and set the selection.
+  void SetTextAndSelectedRange(const std::wstring& display_text,
+                               const NSRange range);
+
+  // Pass the current content of |field_| to SetText(), maintaining
+  // any selection.  Named to be consistent with GTK and Windows,
+  // though here we cannot really do the in-place operation they do.
+  void EmphasizeURLComponents();
 
   scoped_ptr<AutocompleteEditModel> model_;
   scoped_ptr<AutocompletePopupViewMac> popup_view_;