TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index d08a756a49c74f383743b22209859e8775cd595d..33da31c9750781a51b9ba163e676b2199323bd24 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -238,8 +238,7 @@ void OmniboxViewMac::Update() {
 }
 
 void OmniboxViewMac::UpdatePlaceholderText() {
-  if (chrome::ShouldDisplayOriginChip() ||
-      OmniboxFieldTrial::DisplayHintTextWhenPossible()) {
+  if (OmniboxFieldTrial::DisplayHintTextWhenPossible()) {

[Justin Donnelly, 2014/12/03 16:07:25]

It's probably worth double-checking that this field trial still works after your
change. I can't see how it wouldn't, the logic is trivial. But still.

[groby-ooo-7-16, 2015/01/10 00:54:06]

DisplayHintText was introduced as part of origin chip, and is, AFAICT, not used
by anything else. I'll remove hint text as well, but if it's OK with you, a
separate CL after this landed. This is getting large :)

Filed as http://crbug.com/447809

     NSDictionary* placeholder_attributes = @{
       NSFontAttributeName : GetFieldFont(gfx::Font::NORMAL),
       NSForegroundColorAttributeName : [NSColor disabledControlTextColor]
@@ -836,16 +835,12 @@ bool OmniboxViewMac::OnDoCommandBySelector(SEL cmd) {
 void OmniboxViewMac::OnSetFocus(bool control_down) {
   model()->OnSetFocus(control_down);
   controller()->OnSetFocus();
-
-  HandleOriginChipMouseRelease();
 }
 
 void OmniboxViewMac::OnKillFocus() {
   // Tell the model to reset itself.
   model()->OnWillKillFocus();
   model()->OnKillFocus();
-
-  OnDidKillFocus();
 }
 
 void OmniboxViewMac::OnMouseDown(NSInteger button_number) {