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

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: Include missing browsertest .js file in chrome_tests.gypi Created 6 years, 3 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 6617e497f0542a412394352efdc21d68809675e9..441911f9c9d1cbb7b6859845fef11e611deacac3 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"
@@ -25,6 +23,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 {
@@ -234,6 +237,7 @@ TEST_F(ThemeServiceTest, ThemeUpgrade) {
ExtensionRegistry::DISABLED));
}
+#if defined(ENABLE_MANAGED_USERS)
class ThemeServiceSupervisedUserTest : public ThemeServiceTest {
public:
ThemeServiceSupervisedUserTest() {}
@@ -270,6 +274,7 @@ TEST_F(ThemeServiceSupervisedUserTest, SupervisedUserThemeReplacesNativeTheme) {
EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),
CustomThemeSupplier::SUPERVISED_USER_THEME);
}
-#endif
+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // defined(ENABLE_MANAGED_USERS)
}; // namespace theme_service_internal
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698