diff options
author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 17:38:06 +0000 |
---|---|---|
committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 17:38:06 +0000 |
commit | 98901d9f7dc19e58a926970a26e31832d1377fa5 (patch) | |
tree | 83c516f48264356a6bd9df239b62ab3f412efa22 /chrome/browser/net/url_fixer_upper.cc | |
parent | f0b9405a4617ecdffc9a4d8d616cf9bafc84ae9f (diff) | |
download | chromium_src-98901d9f7dc19e58a926970a26e31832d1377fa5.zip chromium_src-98901d9f7dc19e58a926970a26e31832d1377fa5.tar.gz chromium_src-98901d9f7dc19e58a926970a26e31832d1377fa5.tar.bz2 |
Revert 128753 - Add full support for filesystem URLs.
BUG=114484
TEST=existing filesystem tests don't break
Review URL: https://chromiumcodereview.appspot.com/7811006
TBR=ericu@google.com
Review URL: https://chromiumcodereview.appspot.com/9808101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/url_fixer_upper.cc')
-rw-r--r-- | chrome/browser/net/url_fixer_upper.cc | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index 4a4a883..2e025fc 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -412,13 +412,6 @@ std::string URLFixerUpper::SegmentURL(const std::string& text, url_parse::Component(0, static_cast<int>(scheme.length()))))) return scheme; - if (scheme == chrome::kFileSystemScheme) { - // Have the GURL parser do the heavy lifting for us. - url_parse::ParseFileSystemURL(text.data(), - static_cast<int>(text.length()), parts); - return scheme; - } - if (parts->scheme.is_valid()) { // Have the GURL parser do the heavy lifting for us. url_parse::ParseStandardURL(text.data(), static_cast<int>(text.length()), @@ -485,13 +478,6 @@ GURL URLFixerUpper::FixupURL(const std::string& text, if (scheme == chrome::kFileScheme) return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); - // We handle the filesystem scheme separately. - if (scheme == chrome::kFileSystemScheme) { - if (parts.inner_parsed() && parts.inner_parsed()->scheme.is_valid()) - return GURL(text); - return GURL(); - } - // Parse and rebuild about: and chrome: URLs, except about:blank. bool chrome_url = !LowerCaseEqualsASCII(trimmed, chrome::kAboutBlankURL) && ((scheme == chrome::kAboutScheme) || (scheme == chrome::kChromeUIScheme)); |