chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc - Issue 2479593006: Move enable extensions define to a build flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/sync/profile_signin_confirmation_helper_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

« no previous file with comments | « chrome/browser/ui/sync/profile_signin_confirmation_helper.cc ('k') | chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc

diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc

index 895fa7b4d312a8c4d2834d208efefbca1c14f52d..177966ae54ff284a4377eb97d005a6d28ac2319e 100644

--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc

+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc

@@ -33,6 +33,7 @@

#include "components/sync_preferences/testing_pref_service_syncable.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "content/public/test/test_utils.h"

+#include "extensions/features/features.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -42,7 +43,7 @@

#include "chrome/browser/chromeos/settings/device_settings_service.h"

#endif

-#if defined(ENABLE_EXTENSIONS)

+#if BUILDFLAG(ENABLE_EXTENSIONS)

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/test_extension_system.h"

#include "chrome/common/extensions/extension_constants.h"

@@ -91,7 +92,7 @@ class TestingPrefStoreWithCustomReadError : public TestingPrefStore {

PrefReadError read_error_;

};

-#if defined(ENABLE_EXTENSIONS)

+#if BUILDFLAG(ENABLE_EXTENSIONS)

#if defined(OS_WIN)

const base::FilePath::CharType kExtensionFilePath[] =

FILE_PATH_LITERAL("c:\\foo");

@@ -147,7 +148,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {

model_ = BookmarkModelFactory::GetForBrowserContext(profile_.get());

bookmarks::test::WaitForBookmarkModelToLoad(model_);

ASSERT_TRUE(profile_->CreateHistoryService(true, false));

-#if defined(ENABLE_EXTENSIONS)

+#if BUILDFLAG(ENABLE_EXTENSIONS)

extensions::TestExtensionSystem* system =

static_cast<extensions::TestExtensionSystem*>(

extensions::ExtensionSystem::Get(profile_.get()));

@@ -202,7 +203,7 @@ TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Bookmarks) {

profile_.get())));

}

-#if defined(ENABLE_EXTENSIONS)

+#if BUILDFLAG(ENABLE_EXTENSIONS)

TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Extensions) {

ExtensionService* extensions =

extensions::ExtensionSystem::Get(profile_.get())->extension_service();