chrome/browser/supervised_user/supervised_user_service_unittest.cc - Issue 645043003: Cleanup: Prevent usage of various extension headers when extensions support is not compiled in.

Unified Diff: chrome/browser/supervised_user/supervised_user_service_unittest.cc

Issue 645043003: Cleanup: Prevent usage of various extension headers when extensions support is not compiled in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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

« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/sync/glue/extensions_activity_monitor.h » ('j') | extensions/browser/notification_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_service_unittest.cc

diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc

index 4394b869a33225243f11dadc88158ded9ee380bf..a9317cfe24bde0f34f9b9f340ddcffb6fcff6743 100644

--- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc

+++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc

@@ -7,9 +7,6 @@

#include "base/prefs/scoped_user_pref_update.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/chrome_notification_types.h"

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

-#include "chrome/browser/extensions/extension_service_test_base.h"

-#include "chrome/browser/extensions/unpacked_installer.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"

#include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"

@@ -20,15 +17,21 @@

#include "chrome/browser/supervised_user/supervised_user_service_factory.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/common/chrome_paths.h"

-#include "chrome/common/extensions/features/feature_channel.h"

#include "chrome/common/pref_names.h"

#include "chrome/test/base/testing_profile.h"

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

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

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

+#if defined(ENABLE_EXTENSIONS)

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

+#include "chrome/browser/extensions/extension_service_test_base.h"

+#include "chrome/browser/extensions/unpacked_installer.h"

+#include "chrome/common/extensions/features/feature_channel.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_builder.h"

#include "extensions/common/manifest_constants.h"

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

+#endif

using content::MessageLoopRunner;

@@ -171,7 +174,7 @@ TEST_F(SupervisedUserServiceTest, ShutDownCustodianProfileDownloader) {

downloader_service->DownloadProfile(base::Bind(&OnProfileDownloadedFail));

}

-#if !defined(OS_ANDROID)

+#if defined(ENABLE_EXTENSIONS)

class SupervisedUserServiceExtensionTestBase

: public extensions::ExtensionServiceTestBase {

public:

@@ -423,4 +426,4 @@ TEST_F(SupervisedUserServiceExtensionTest, InstallContentPacks) {

EXPECT_EQ(SupervisedUserURLFilter::ALLOW,

url_filter->GetFilteringBehaviorForURL(moose_url));

}

-#endif // !defined(OS_ANDROID)

+#endif // defined(ENABLE_EXTENSIONS)