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

Unified Diff: chrome/browser/browsing_data/browsing_data_helper_unittest.cc

Issue 428323002: ifdef remaining extensions code in chrome/browser/browsing_data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang again Created 6 years, 5 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/browser/browsing_data/browsing_data_helper_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
index f78f3c4b02e3488384c277ff3a32041f0804d6d2..853940e03c52a634d91a30becafb6b2196df00ef 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
@@ -5,13 +5,16 @@
#include "chrome/browser/browsing_data/browsing_data_helper.h"
#include "base/strings/stringprintf.h"
-#include "chrome/browser/extensions/mock_extension_special_storage_policy.h"
#include "chrome/common/url_constants.h"
#include "extensions/common/constants.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
#include "url/url_constants.h"
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/mock_extension_special_storage_policy.h"
+#endif
+
namespace {
const char kTestOrigin1[] = "http://host1:1/";
@@ -49,7 +52,7 @@ class BrowsingDataHelperTest : public testing::Test {
bool Match(const GURL& origin,
int mask,
- ExtensionSpecialStoragePolicy* policy) {
+ quota::SpecialStoragePolicy* policy) {
return BrowsingDataHelper::DoesOriginMatchMask(origin, mask, policy);
}
@@ -104,6 +107,7 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotAllExtension) {
EXPECT_FALSE(IsExtensionScheme(content::kViewSourceScheme));
}
+#if defined(ENABLE_EXTENSIONS)
TEST_F(BrowsingDataHelperTest, TestMatches) {
scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
new MockExtensionSpecialStoragePolicy;
@@ -153,6 +157,7 @@ TEST_F(BrowsingDataHelperTest, TestMatches) {
kUnprotected | kProtected | kExtension,
mock_policy.get()));
}
+#endif
// If extensions are disabled, there is no policy.
TEST_F(BrowsingDataHelperTest, TestNoPolicyMatches) {
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_helper.cc ('k') | chrome/browser/browsing_data/browsing_data_remover.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698