Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7661)

Unified Diff: chrome/renderer/content_settings_observer_unittest.cc

Issue 464693002: ifdef extensions bits in ContentSettingsObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/content_settings_observer_unittest.cc
diff --git a/chrome/renderer/content_settings_observer_unittest.cc b/chrome/renderer/content_settings_observer_unittest.cc
index cb2f69d5fe03121cddcbadec9442063c71be4912..11505b61fa8b675c9f1a5d339f45ccd78b106849 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(
« chrome/renderer/content_settings_observer.cc ('K') | « chrome/renderer/content_settings_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698