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

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright 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/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/format_macros.h"
@@ skipping 500 matching lines @@
     content::RecordAction(base::UserMetricsAction("OmniboxInputInProgress"));
     autocomplete_controller()->ResetSession();
   }
 
   // The following code handles two cases:
   // * For HIDE_ON_USER_INPUT and ON_SRP, it hides the chip when user input
   //   begins.
   // * For HIDE_ON_MOUSE_RELEASE, which only hides the chip on mouse release if
   //   the omnibox is empty, it handles the "omnibox was not empty" case by
   //   acting like HIDE_ON_USER_INPUT.
-  if (chrome::ShouldDisplayOriginChipV2() && in_progress)
+  if (chrome::ShouldDisplayOriginChip() && in_progress)
     controller()->GetToolbarModel()->set_origin_chip_enabled(false);
 
   controller_->GetToolbarModel()->set_input_in_progress(in_progress);
   controller_->Update(NULL);
 
   if (user_input_in_progress_ || !in_revert_)
     delegate_->OnInputStateChanged();
 }
 
 void OmniboxEditModel::Revert() {
@@ skipping 928 matching lines @@
   // Update state and notify view if the omnibox has focus and the caret
   // visibility changed.
   const bool was_caret_visible = is_caret_visible();
   focus_state_ = state;
   if (focus_state_ != OMNIBOX_FOCUS_NONE &&
       is_caret_visible() != was_caret_visible)
     view_->ApplyCaretVisibility();
 
   delegate_->OnFocusChanged(focus_state_, reason);
 }