Move the offline URL trimming to GetFormattedURL.

ios/chrome/browser/reading_list/offline_url_utils.cc

 // Copyright 2016 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/reading_list/offline_url_utils.h"
 
+#include "base/logging.h"
 #include "base/md5.h"
+#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "components/reading_list/ios/offline_url_utils.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "net/base/url_util.h"
 
 namespace {
 const char kVirtualURLQueryParam[] = "virtualURL";
 }
 
 namespace reading_list {
 
@@ skipping 37 matching lines @@
                 offline_path.value() + distilled_url.path());
   if (resources_root_url) {
     *resources_root_url = file_url.Resolve(".");
   }
   return file_url;
 }
 
 bool IsOfflineURL(const GURL& url) {
   return url.SchemeIs(kChromeUIScheme) && url.host() == kChromeUIOfflineHost;
 }
+
+base::string16 StripSchemeFromOnlineUrl(base::string16 online_url) {
+  base::string16 https_scheme = base::UTF8ToUTF16(base::StringPrintf(
+      "%s%s", url::kHttpsScheme, url::kStandardSchemeSeparator));
+  if (base::StartsWith(online_url, https_scheme,
+                       base::CompareCase::SENSITIVE)) {
+    return online_url.substr(https_scheme.length());
+  }
+  // http:// scheme should already have been trimmed at this point.
+  // DCHECK to detect formatting changes in omnibox.
+  DCHECK(!base::StartsWith(
+      online_url, base::UTF8ToUTF16(base::StringPrintf(

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

Optional nit: For the purpose of your DCHECK this should be fully sufficient:

DCHECK(!base::StartsWith(online_url, base::UTF8ToUTF16(url::kHttpScheme));

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

This would DCHECK on http://http.com.
I will keep the kStandardSchemeSeparator

+                      "%s%s", url::kHttpScheme, url::kStandardSchemeSeparator)),
+      base::CompareCase::SENSITIVE));
+  return online_url;
 }
+}