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

Unified Diff: chrome/browser/themes/theme_service_unittest.cc

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits, minor refactoring 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/themes/theme_service_unittest.cc
diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc
index 45f82e4034d3a363d0d735d1f5da6b9b91017548..bfc4a5c44d34bdc575ff371a2962327c1edfbd81 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -10,8 +10,6 @@
#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/supervised_user/supervised_user_service.h"
-#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
#include "chrome/browser/themes/custom_theme_supplier.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "chrome/common/chrome_paths.h"
@@ -24,6 +22,11 @@
#include "extensions/common/extension.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
+#endif
+
using extensions::ExtensionRegistry;
namespace theme_service_internal {
@@ -231,6 +234,7 @@ TEST_F(ThemeServiceTest, ThemeUpgrade) {
ExtensionRegistry::DISABLED));
}
+#if defined(ENABLE_MANAGED_USERS)
class ThemeServiceSupervisedUserTest : public ThemeServiceTest {
public:
ThemeServiceSupervisedUserTest() {}
@@ -268,5 +272,6 @@ TEST_F(ThemeServiceSupervisedUserTest, SupervisedUserThemeReplacesNativeTheme) {
CustomThemeSupplier::SUPERVISED_USER_THEME);
}
#endif
+#endif
Bernhard Bauer 2014/07/14 16:39:05 It might be useful to add // defined(...) here.
mckev 2014/07/14 23:50:02 Good call - added.
}; // namespace theme_service_internal

Powered by Google App Engine
This is Rietveld 408576698