Revert "Build Glic browser_tests on Linux"
This reverts commit 2a331365b3af170697b8d49d1f647b74fcd592fc.
Reason for revert: Tests are broken on Linux Wayland bot
Original change's description:
> Build Glic browser_tests on Linux
>
> This revealed a number of other parts of the build that avoid compiling
> on linux so this CL updates these to use the existing `enable_glic`
> build flag.
>
> Bug: 378141058
> Change-Id: Idf87ad8f1fb2df3fb620482d760db17a3424a8e7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6089193
> Reviewed-by: Nico Weber <[email protected]>
> Commit-Queue: David Bokan <[email protected]>
> Reviewed-by: Eshwar Stalin <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1395995}
Bug: 378141058
Change-Id: Ifdad258abc9529557204e3b24e2980f5e9a07824
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6089889
Commit-Queue: David Bokan <[email protected]>
Owners-Override: Mike Wasserman <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Reviewed-by: Eshwar Stalin <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1396077}
diff --git a/chrome/browser/global_features.h b/chrome/browser/global_features.h
index 7a7ee16..481f563 100644
--- a/chrome/browser/global_features.h
+++ b/chrome/browser/global_features.h
@@ -9,7 +9,6 @@
#include "base/functional/callback.h"
#include "build/build_config.h"
-#include "chrome/common/buildflags.h"
namespace system_permission_settings {
class PlatformHandle;
@@ -18,8 +17,6 @@
namespace whats_new {
class WhatsNewRegistry;
} // namespace whats_new
-#endif
-#if BUILDFLAG(ENABLE_GLIC)
namespace glic {
class GlicBackgroundModeManager;
class GlicProfileManager;
@@ -56,13 +53,13 @@
whats_new::WhatsNewRegistry* whats_new_registry() {
return whats_new_registry_.get();
}
-#endif
-#if BUILDFLAG(ENABLE_GLIC)
glic::GlicProfileManager* glic_profile_manager() {
return glic_profile_manager_.get();
}
+#endif
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
glic::GlicBackgroundModeManager* glic_background_mode_manager() {
return glic_background_mode_manager_.get();
}
@@ -89,10 +86,10 @@
system_permissions_platform_handle_;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
std::unique_ptr<whats_new::WhatsNewRegistry> whats_new_registry_;
+ std::unique_ptr<glic::GlicProfileManager> glic_profile_manager_;
#endif
-#if BUILDFLAG(ENABLE_GLIC)
- std::unique_ptr<glic::GlicProfileManager> glic_profile_manager_;
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
std::unique_ptr<glic::GlicBackgroundModeManager>
glic_background_mode_manager_;
#endif
