summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/content_settings_observer_unittest.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 23:06:09 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 23:06:09 +0000
commit52d97c2afd64feed9ee0c056fc04227a5bbf11c8 (patch)
treec2463b3f059876df49ed613a5d8e16ecb554091b /chrome/renderer/content_settings_observer_unittest.cc
parentcb17aadff2900839a2f3d7cfe7bef9d6b34244aa (diff)
downloadchromium_src-52d97c2afd64feed9ee0c056fc04227a5bbf11c8.zip
chromium_src-52d97c2afd64feed9ee0c056fc04227a5bbf11c8.tar.gz
chromium_src-52d97c2afd64feed9ee0c056fc04227a5bbf11c8.tar.bz2
Correctly whitelist ftp directory listings.
Instead of guessing whether a page is actually a directory listing that requires JavaScript to work, just store this information in the WebURLResponse BUG=121399 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10440014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/content_settings_observer_unittest.cc')
-rw-r--r--chrome/renderer/content_settings_observer_unittest.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/renderer/content_settings_observer_unittest.cc b/chrome/renderer/content_settings_observer_unittest.cc
index db587ff..de49b71 100644
--- a/chrome/renderer/content_settings_observer_unittest.cc
+++ b/chrome/renderer/content_settings_observer_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 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.
@@ -49,14 +49,6 @@ TEST_F(ContentSettingsObserverTest, WhitelistedSchemes) {
WebSecurityOrigin::create(file_url),
GURL("file:///dir/file")));
- GURL ftp_url("ftp:///dir/");
- EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings(
- WebSecurityOrigin::create(ftp_url),
- GURL("ftp:///dir/")));
- EXPECT_FALSE(ContentSettingsObserver::IsWhitelistedForContentSettings(
- WebSecurityOrigin::create(ftp_url),
- GURL("ftp:///dir/file")));
-
GURL http_url =
GURL("http://server.com/path");
EXPECT_FALSE(ContentSettingsObserver::IsWhitelistedForContentSettings(