Move the offline URL trimming to GetFormattedURL.

ios/chrome/browser/ui/toolbar/toolbar_model_impl_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.
 
 #include "ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios.h"
 
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/toolbar/toolbar_model_impl.h"
 #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/web_state/web_state.h"
 
 namespace {
 const size_t kMaxURLDisplayChars = 32 * 1024;
 
 bookmarks::BookmarkModel* GetBookmarkModelForTab(Tab* tab) {
   web::WebState* web_state = [tab webState];
   if (!web_state)
     return nullptr;
   web::BrowserState* browser_state = web_state->GetBrowserState();
   if (!browser_state)
     return nullptr;
   return ios::BookmarkModelFactory::GetForBrowserState(
       ios::ChromeBrowserState::FromBrowserState(browser_state));
 }
 }  // namespace
 
 ToolbarModelImplIOS::ToolbarModelImplIOS(ToolbarModelDelegateIOS* delegate) {
   delegate_ = delegate;
   toolbar_model_.reset(new ToolbarModelImpl(delegate, kMaxURLDisplayChars));
 }
 
 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().
   web::WebState* web_state = delegate_->GetCurrentTab().webState;
   return web_state && web_state->IsLoading() && !IsCurrentTabNativePage();
 }
 
 CGFloat ToolbarModelImplIOS::GetLoadProgressFraction() {
   web::WebState* webState = delegate_->GetCurrentTab().webState;
   return webState ? webState->GetLoadingProgress() : 0.0;
@@ skipping 23 matching lines @@
   Tab* currentTab = delegate_->GetCurrentTab();
   bookmarks::BookmarkModel* bookmarkModel = GetBookmarkModelForTab(currentTab);
   return currentTab && bookmarkModel &&
          bookmarkModel->GetMostRecentlyAddedUserNodeForURL(currentTab.url);
 }
 
 bool ToolbarModelImplIOS::ShouldDisplayHintText() {
   Tab* currentTab = delegate_->GetCurrentTab();
   return [currentTab.webController wantsLocationBarHintText];
 }
+
+base::string16 ToolbarModelImplIOS::GetFormattedURL(size_t* prefix_end) const {
+  base::string16 formatted_url = toolbar_model_->GetFormattedURL(prefix_end);
+  Tab* currentTab = delegate_->GetCurrentTab();

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

s/currentTab/current_tab

Looks like existing code violates Style Guide.

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

Done.

+  if ([currentTab isOffline] &&

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

If you choose not to add anything to Tab (which is totally up to you), then you
can do this:

reading_list::IsOfflineURL(currentTab.webState->GetVisibleURL())

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

We need the URL, not the virtualURL.
Done.

+      GetSecurityLevel(true) == security_state::SecurityLevel::NONE) {

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

nit: GetSecurityLevel(true /*ignore_editing*/)

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

Done.

+    return reading_list::StripSchemeFromOnlineUrl(formatted_url);
+  }
+  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();
+}