Move the offline URL trimming to GetFormattedURL.

ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.mm

 // 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.
 
 #import "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
 
 #include "base/logging.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/prefs/pref_service.h"
 #include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/pref_names.h"
-#include "ios/chrome/browser/reading_list/offline_url_utils.h"
 #include "ios/chrome/browser/ssl/ios_security_state_tab_helper.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/web/public/navigation_item.h"
 #import "ios/web/public/web_state/web_state.h"
 
 ToolbarModelDelegateIOS::ToolbarModelDelegateIOS(TabModel* tab_model)
     : tab_model_([tab_model retain]) {}
 
 ToolbarModelDelegateIOS::~ToolbarModelDelegateIOS() {}
@@ skipping 19 matching lines @@
     const base::string16& formatted_url) const {
   return AutocompleteInput::FormattedStringWithEquivalentMeaning(
       url, formatted_url, AutocompleteSchemeClassifierImpl());
 }
 
 bool ToolbarModelDelegateIOS::GetURL(GURL* url) const {
   DCHECK(url);
   web::NavigationItem* item = GetNavigationItem();
   if (!item)
     return false;
-
-  if (!ShouldDisplayURL()) {
-    *url = GURL();
-    return true;
-  }
-
-  // For security reasons, we shouldn't display the https scheme and secure
-  // padlock when there's no active ssl session.
-  // To hide the scheme we set it http when the loaded url is offline.
-  if (reading_list::IsOfflineURL(item->GetURL()) &&
-      item->GetVirtualURL().SchemeIs(url::kHttpsScheme)) {
-    GURL::Replacements replacements;
-    replacements.SetScheme(url::kHttpScheme,
-                           url::Component(0, strlen(url::kHttpScheme)));
-    *url = item->GetVirtualURL().ReplaceComponents(replacements);
-    return true;
-  }
-
-  *url = item->GetVirtualURL();
+  *url = ShouldDisplayURL() ? item->GetVirtualURL() : GURL();

[Eugene But (OOO till 7-30), 2016/12/28 17:02:59]

I know that you just reverting to the old code, but could you please
s/GURL()/GURL::EmptyURL()

[Olivier, 2016/12/29 12:37:20]

Done.

   return true;
 }
 
 bool ToolbarModelDelegateIOS::ShouldDisplayURL() const {
   web::NavigationItem* item = GetNavigationItem();
   if (item) {
     GURL url = item->GetURL();
     GURL virtual_url = item->GetVirtualURL();
     if (url.SchemeIs(kChromeUIScheme) ||
         virtual_url.SchemeIs(kChromeUIScheme)) {
@@ skipping 32 matching lines @@
          security_state::MALICIOUS_CONTENT_STATUS_NONE;
 }
 
 scoped_refptr<net::X509Certificate> ToolbarModelDelegateIOS::GetCertificate()
     const {
   web::NavigationItem* item = GetNavigationItem();
   if (item)
     return item->GetSSL().certificate;
   return scoped_refptr<net::X509Certificate>();
 }