Remove origin chip v1 and "hide on input" v2 behavior.

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

 // Copyright (c) 2012 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/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 191 matching lines @@
     // store existing state before anyone tries to setup the new
     // state.  Anyhow, it would look something like this.
 #if 0
     [[field_ window] makeFirstResponder:field_];
     [[field_ currentEditor] setSelectedRange:state->selection];
 #endif
   }
 }
 
 void OmniboxViewMac::Update() {
-  if (chrome::ShouldDisplayOriginChipV2()) {
+  if (chrome::ShouldDisplayOriginChip()) {
     NSDictionary* placeholder_attributes = @{
       NSFontAttributeName : GetFieldFont(gfx::Font::NORMAL),
       NSForegroundColorAttributeName : [NSColor disabledControlTextColor]
     };
     base::scoped_nsobject<NSMutableAttributedString> placeholder_text(
         [[NSMutableAttributedString alloc]
             initWithString:base::SysUTF16ToNSString(GetHintText())
                 attributes:placeholder_attributes]);
     [[field_ cell] setPlaceholderAttributedString:placeholder_text];
   }
@@ skipping 790 matching lines @@
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }