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

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

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/cookies_tree_model_unittest.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
index 286862a8d83d842c1f5912c24d3f02f733f0deef..f8a9a29a3037b3374d60bd6c7ec753f81db40b73 100644
--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
@@ -32,11 +32,12 @@
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_types.h"
#include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/features/features.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#endif
@@ -49,7 +50,7 @@ class CookiesTreeModelTest : public testing::Test {
public:
~CookiesTreeModelTest() override {
// Avoid memory leaks.
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
special_storage_policy_ = nullptr;
#endif
profile_.reset();
@@ -91,7 +92,7 @@ class CookiesTreeModelTest : public testing::Test {
HostContentSettingsMapFactory::GetForProfile(profile_.get()),
profile_->GetPrefs(),
kExtensionScheme);
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
special_storage_policy_ =
new ExtensionSpecialStoragePolicy(cookie_settings.get());
#endif
@@ -449,7 +450,7 @@ class CookiesTreeModelTest : public testing::Test {
protected:
ExtensionSpecialStoragePolicy* special_storage_policy() {
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
return special_storage_policy_.get();
#else
return nullptr;
@@ -485,7 +486,7 @@ class CookiesTreeModelTest : public testing::Test {
scoped_refptr<MockBrowsingDataMediaLicenseHelper>
mock_browsing_data_media_license_helper_;
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
#endif
};
« no previous file with comments | « chrome/browser/browsing_data/cookies_tree_model.cc ('k') | chrome/browser/browsing_data/downloads_counter_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698