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

chrome/browser/ui/toolbar/toolbar_model_impl.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/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
@@ skipping 168 matching lines @@
   return (input_in_progress() && !ignore_editing) ?
       NONE : GetSecurityLevelForWebContents(delegate_->GetActiveWebContents());
 }
 
 int ToolbarModelImpl::GetIcon() const {
   if (WouldPerformSearchTermReplacement(false)) {
     // The secured version of the search icon is necessary if neither the search
     // button nor origin chip are present to indicate the security state.
     return (chrome::GetDisplaySearchButtonConditions() ==
         chrome::DISPLAY_SEARCH_BUTTON_NEVER) &&
-        !chrome::ShouldDisplayOriginChipV2() ?
+        !chrome::ShouldDisplayOriginChip() ?
             IDR_OMNIBOX_SEARCH_SECURED : IDR_OMNIBOX_SEARCH;
   }
 
-  // When the original site chip experiment is running, the icon in the location
-  // bar, when not the search icon, should be the page icon.
-  if (chrome::ShouldDisplayOriginChip())
-    return GetIconForSecurityLevel(NONE);
-
   return GetIconForSecurityLevel(GetSecurityLevel(false));
 }
 
 int ToolbarModelImpl::GetIconForSecurityLevel(SecurityLevel level) const {
   static int icon_ids[NUM_SECURITY_LEVELS] = {
     IDR_LOCATION_BAR_HTTP,
     IDR_OMNIBOX_HTTPS_VALID,
     IDR_OMNIBOX_HTTPS_VALID,
     IDR_OMNIBOX_HTTPS_WARNING,
     IDR_OMNIBOX_HTTPS_POLICY_WARNING,
@@ skipping 70 matching lines @@
     }
   }
 
   if (!delegate_->InTabbedBrowser() || !ShouldDisplayURL() ||
       !url_replacement_enabled())
     return false;
 
   if (chrome::ShouldDisplayOriginChip())
     return true;
 
-  const chrome::OriginChipV2Condition chip_condition =
-      chrome::GetOriginChipV2Condition();
-  return (chip_condition != chrome::ORIGIN_CHIP_V2_DISABLED) &&
-      ((chip_condition != chrome::ORIGIN_CHIP_V2_ON_SRP) ||
+  const chrome::OriginChipCondition chip_condition =
+      chrome::GetOriginChipCondition();
+  return (chip_condition == chrome::ORIGIN_CHIP_ALWAYS) ||
+      ((chip_condition == chrome::ORIGIN_CHIP_ON_SRP) &&
        WouldPerformSearchTermReplacement(false));
 }
 
 NavigationController* ToolbarModelImpl::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   WebContents* current_tab = delegate_->GetActiveWebContents();
   return current_tab ? &current_tab->GetController() : NULL;
 }
@@ skipping 33 matching lines @@
   if (entry &&
       google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL()))
     return search_terms;
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   ToolbarModel::SecurityLevel security_level = GetSecurityLevel(ignore_editing);
   return ((security_level == NONE) || (security_level == SECURITY_ERROR)) ?
       base::string16() : search_terms;
 }