diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 03:39:59 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 03:41:18 +0000 |
| commit | 356eb73c0f2be7c30c79b12657684d116837cf72 (patch) | |
| tree | f5877af2766bec6dcfd5596b69759f7bd95dc5d0 /chrome/renderer/content_settings_observer_unittest.cc | |
| parent | 93d9d6b7430bb0938bf8da90d5d3c5e633b483f8 (diff) | |
| download | chromium_src-356eb73c0f2be7c30c79b12657684d116837cf72.zip chromium_src-356eb73c0f2be7c30c79b12657684d116837cf72.tar.gz chromium_src-356eb73c0f2be7c30c79b12657684d116837cf72.tar.bz2 | |
ifdef extensions bits in ContentSettingsObserver.
BUG=402728
Review URL: https://codereview.chromium.org/464693002
Cr-Commit-Position: refs/heads/master@{#289188}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/content_settings_observer_unittest.cc')
| -rw-r--r-- | chrome/renderer/content_settings_observer_unittest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/renderer/content_settings_observer_unittest.cc b/chrome/renderer/content_settings_observer_unittest.cc index cb2f69d..11505b6 100644 --- a/chrome/renderer/content_settings_observer_unittest.cc +++ b/chrome/renderer/content_settings_observer_unittest.cc @@ -6,12 +6,15 @@ #include "chrome/common/url_constants.h" #include "content/public/common/url_constants.h" -#include "extensions/common/constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "url/gurl.h" +#if defined(ENABLE_EXTENSIONS) +#include "extensions/common/constants.h" +#endif + using blink::WebSecurityOrigin; typedef testing::Test ContentSettingsObserverTest; @@ -31,11 +34,13 @@ TEST_F(ContentSettingsObserverTest, WhitelistedSchemes) { WebSecurityOrigin::create(chrome_dev_tools_url), GURL())); +#if defined(ENABLE_EXTENSIONS) GURL extension_url = GURL(std::string(extensions::kExtensionScheme).append(end_url)); EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings( WebSecurityOrigin::create(extension_url), GURL())); +#endif GURL file_url("file:///dir/"); EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings( |