TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS

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/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 147 matching lines @@
       return NONE;
   }
 }
 
 // ToolbarModelImpl Implementation.
 base::string16 ToolbarModelImpl::GetText() const {
   base::string16 search_terms(GetSearchTerms(false));
   if (!search_terms.empty())
     return search_terms;
 
-  if (WouldOmitURLDueToOriginChip())
-    return base::string16();
-
   return GetFormattedURL(NULL);
 }
 
 base::string16 ToolbarModelImpl::GetFormattedURL(size_t* prefix_end) const {
   std::string languages;  // Empty if we don't have a |navigation_controller|.
   Profile* profile = GetProfile();
   if (profile)
     languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
 
   GURL url(GetURL());
@@ skipping 45 matching lines @@
 }
 
 ToolbarModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
     bool ignore_editing) const {
   // When editing, assume no security style.
   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::ShouldDisplayOriginChip() ?
-            IDR_OMNIBOX_SEARCH_SECURED : IDR_OMNIBOX_SEARCH;
-  }
+  if (WouldPerformSearchTermReplacement(false))
+    return IDR_OMNIBOX_SEARCH_SECURED;
 
   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,
@@ skipping 45 matching lines @@
         virtual_url.SchemeIs(content::kChromeUIScheme)) {
       if (!url.SchemeIs(content::kChromeUIScheme))
         url = virtual_url;
       return url.host() != chrome::kChromeUINewTabHost;
     }
   }
 
   return !chrome::IsInstantNTP(delegate_->GetActiveWebContents());
 }
 
-bool ToolbarModelImpl::WouldOmitURLDueToOriginChip() const {
-  const char kInterstitialShownKey[] = "interstitial_shown";
-
-  // When users type URLs and hit enter, continue to show those URLs until
-  // the navigation commits or an interstitial is shown, because having the
-  // omnibox clear immediately feels like the input was ignored.
-  NavigationController* navigation_controller = GetNavigationController();
-  if (navigation_controller) {
-    NavigationEntry* pending_entry = navigation_controller->GetPendingEntry();
-    if (pending_entry) {
-      const NavigationEntry* visible_entry =
-          navigation_controller->GetVisibleEntry();
-      base::string16 unused;
-      // Keep track that we've shown the origin chip on an interstitial so it
-      // can be shown even after the interstitial was dismissed, to avoid
-      // showing the chip, removing it and then showing it again.
-      if (visible_entry &&
-          visible_entry->GetPageType() == content::PAGE_TYPE_INTERSTITIAL &&
-          !pending_entry->GetExtraData(kInterstitialShownKey, &unused))
-        pending_entry->SetExtraData(kInterstitialShownKey, base::string16());
-      const ui::PageTransition transition_type =
-          pending_entry->GetTransitionType();
-      if ((transition_type & ui::PAGE_TRANSITION_TYPED) != 0 &&
-          !pending_entry->GetExtraData(kInterstitialShownKey, &unused))
-        return false;
-    }
-  }
-
-  if (!delegate_->InTabbedBrowser() || !ShouldDisplayURL() ||
-      !url_replacement_enabled())
-    return false;
-
-  if (chrome::ShouldDisplayOriginChip())
-    return true;
-
-  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;
 }
 
 Profile* ToolbarModelImpl::GetProfile() const {
   NavigationController* navigation_controller = GetNavigationController();
@@ skipping 30 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;
 }