Move the offline URL trimming to GetFormattedURL.

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

Index: ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios.mm
diff --git a/ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios.mm b/ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios.mm
index af65aef02d7bdb81a92b30995dcce8cabdb2bb30..6d4d518e67b94e7dc1be84c1ec0f3c2cb15a1cd3 100644
--- a/ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios.mm
+++ b/ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios.mm
@@ -9,8 +9,10 @@
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
+#include "ios/chrome/browser/reading_list/offline_url_utils.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
+#import "ios/web/public/navigation_item.h"
 #import "ios/web/public/web_state/web_state.h"
 
 namespace {
@@ -35,10 +37,6 @@ ToolbarModelImplIOS::ToolbarModelImplIOS(ToolbarModelDelegateIOS* delegate) {
 
 ToolbarModelImplIOS::~ToolbarModelImplIOS() {}
 
-ToolbarModel* ToolbarModelImplIOS::GetToolbarModel() {
-  return toolbar_model_.get();
-}
-
 bool ToolbarModelImplIOS::IsLoading() {
   // Please note, ToolbarModel's notion of isLoading is slightly different from
   // WebState's IsLoading().
@@ -60,25 +58,68 @@ bool ToolbarModelImplIOS::CanGoForward() {
 }
 
 bool ToolbarModelImplIOS::IsCurrentTabNativePage() {
-  Tab* currentTab = delegate_->GetCurrentTab();
-  return currentTab && currentTab.url.SchemeIs(kChromeUIScheme);
+  Tab* current_tab = delegate_->GetCurrentTab();
+  return current_tab && current_tab.url.SchemeIs(kChromeUIScheme);
 }
 
 bool ToolbarModelImplIOS::IsCurrentTabBookmarked() {
-  Tab* currentTab = delegate_->GetCurrentTab();
-  bookmarks::BookmarkModel* bookmarkModel = GetBookmarkModelForTab(currentTab);
-  return currentTab && bookmarkModel &&
-         bookmarkModel->IsBookmarked(currentTab.url);
+  Tab* current_tab = delegate_->GetCurrentTab();
+  bookmarks::BookmarkModel* bookmarkModel = GetBookmarkModelForTab(current_tab);
+  return current_tab && bookmarkModel &&
+         bookmarkModel->IsBookmarked(current_tab.url);
 }
 
 bool ToolbarModelImplIOS::IsCurrentTabBookmarkedByUser() {
-  Tab* currentTab = delegate_->GetCurrentTab();
-  bookmarks::BookmarkModel* bookmarkModel = GetBookmarkModelForTab(currentTab);
-  return currentTab && bookmarkModel &&
-         bookmarkModel->GetMostRecentlyAddedUserNodeForURL(currentTab.url);
+  Tab* current_tab = delegate_->GetCurrentTab();
+  bookmarks::BookmarkModel* bookmarkModel = GetBookmarkModelForTab(current_tab);
+  return current_tab && bookmarkModel &&
+         bookmarkModel->GetMostRecentlyAddedUserNodeForURL(current_tab.url);
 }
 
 bool ToolbarModelImplIOS::ShouldDisplayHintText() {
-  Tab* currentTab = delegate_->GetCurrentTab();
-  return [currentTab.webController wantsLocationBarHintText];
+  Tab* current_tab = delegate_->GetCurrentTab();
+  return [current_tab.webController wantsLocationBarHintText];
+}
+
+base::string16 ToolbarModelImplIOS::GetFormattedURL(size_t* prefix_end) const {
+  base::string16 formatted_url = toolbar_model_->GetFormattedURL(prefix_end);
+  Tab* current_tab = delegate_->GetCurrentTab();
+  GURL url =
+      current_tab.webState->GetNavigationManager()->GetVisibleItem()->GetURL();
+  if (reading_list::IsOfflineURL(url) &&
+      GetSecurityLevel(true /*ignore_editing*/) ==
+          security_state::SecurityLevel::NONE) {
+    size_t removed = 0;
+    formatted_url =
+        reading_list::StripSchemeFromOnlineURL(formatted_url, &removed);
+    if (prefix_end) {
+      *prefix_end -= removed;
+    }
+  }
+  return formatted_url;
+}
+
+GURL ToolbarModelImplIOS::GetURL() const {
+  return toolbar_model_->GetURL();
+}
+
+security_state::SecurityLevel ToolbarModelImplIOS::GetSecurityLevel(
+    bool ignore_editing) const {
+  return toolbar_model_->GetSecurityLevel(ignore_editing);
+}
+
+gfx::VectorIconId ToolbarModelImplIOS::GetVectorIcon() const {
+  return toolbar_model_->GetVectorIcon();
+}
+
+base::string16 ToolbarModelImplIOS::GetSecureVerboseText() const {
+  return toolbar_model_->GetSecureVerboseText();
+}
+
+base::string16 ToolbarModelImplIOS::GetEVCertName() const {
+  return toolbar_model_->GetEVCertName();
+}
+
+bool ToolbarModelImplIOS::ShouldDisplayURL() const {
+  return toolbar_model_->ShouldDisplayURL();
 }