diff options
author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 18:13:13 +0000 |
---|---|---|
committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 18:13:13 +0000 |
commit | f04e9a038f4ac103db30821a5aa3bf01780dced6 (patch) | |
tree | 5a8aa3fb5011bb41c4a47e8026c3c2c501cd4f1b /chrome/browser/browsing_data_helper_unittest.cc | |
parent | b3244ee0593eb76ff01b9a5112a5572b5b4602e0 (diff) | |
download | chromium_src-f04e9a038f4ac103db30821a5aa3bf01780dced6.zip chromium_src-f04e9a038f4ac103db30821a5aa3bf01780dced6.tar.gz chromium_src-f04e9a038f4ac103db30821a5aa3bf01780dced6.tar.bz2 |
Revert 130574 - Adding a BrowsingDataHelper class to hold some useful methods.
*** REVERT NOTICE ***
This CL reliably broke a pyauto test.
See
http://build.chromium.org/p/chromium.pyauto/builders/Linux%20%28deb%29/builds/31393/
where it failed first, and this is the only CL in that range.
***
There's simply no good reason to hardcode checks against
chrome::kExtensionScheme in various bits of BrowsingData*. BrowsingDataHelper
provides a static method that we can start using whenever we need to know about
browsing-data-relevant schemes.
BUG=121636
TEST=unit_tests:BrowsingDataRemover*
Review URL: https://chromiumcodereview.appspot.com/9958111
TBR=mkwst@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9982012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_helper_unittest.cc')
-rw-r--r-- | chrome/browser/browsing_data_helper_unittest.cc | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/chrome/browser/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data_helper_unittest.cc deleted file mode 100644 index a074d2b..0000000 --- a/chrome/browser/browsing_data_helper_unittest.cc +++ /dev/null @@ -1,58 +0,0 @@ -// 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. - -#include "chrome/browser/browsing_data_helper.h" - -#include "base/stringprintf.h" -#include "chrome/common/url_constants.h" -#include "content/public/common/url_constants.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" - -namespace { - -class BrowsingDataHelperTest : public testing::Test { - public: - BrowsingDataHelperTest() {} - virtual ~BrowsingDataHelperTest() {} - - bool IsValidScheme(const std::string& scheme) { - GURL test(scheme + "://example.com"); - return (BrowsingDataHelper::HasValidScheme(test) && - BrowsingDataHelper::IsValidScheme(scheme) && - BrowsingDataHelper::IsValidScheme( - WebKit::WebString::fromUTF8(scheme))); - } - - private: - DISALLOW_COPY_AND_ASSIGN(BrowsingDataHelperTest); -}; - -TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreValid) { - EXPECT_TRUE(IsValidScheme(chrome::kHttpScheme)); - EXPECT_TRUE(IsValidScheme(chrome::kHttpsScheme)); - EXPECT_TRUE(IsValidScheme(chrome::kFtpScheme)); - EXPECT_TRUE(IsValidScheme(chrome::kDataScheme)); - EXPECT_TRUE(IsValidScheme("feed")); - EXPECT_TRUE(IsValidScheme(chrome::kBlobScheme)); - EXPECT_TRUE(IsValidScheme(chrome::kFileSystemScheme)); - - EXPECT_FALSE(IsValidScheme("invalid-scheme-i-just-made-up")); -} - -TEST_F(BrowsingDataHelperTest, ChromeSchemesAreInvalid) { - EXPECT_FALSE(IsValidScheme(chrome::kExtensionScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kAboutScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kChromeDevToolsScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kChromeInternalScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kChromeUIScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kJavaScriptScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kMailToScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kMetadataScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kSwappedOutScheme)); - EXPECT_FALSE(IsValidScheme(chrome::kViewSourceScheme)); -} - -} // namespace |