| Index: ui/views/widget/widget_unittest.cc
|
| diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
|
| index 41d666e12c110ad307a69f760350f4066482b8cf..cf6ee511d9d9ff6f052f9468e582e81a78824019 100644
|
| --- a/ui/views/widget/widget_unittest.cc
|
| +++ b/ui/views/widget/widget_unittest.cc
|
| @@ -7,7 +7,7 @@
|
| #include <set>
|
|
|
| #include "base/bind.h"
|
| -#include "base/environment.h"
|
| +#include "base/command_line.h"
|
| #include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| @@ -3740,14 +3740,13 @@
|
| Widget::InitParams init_params,
|
| const Widget::InitParams::WindowOpacity opacity) {
|
| #if defined(USE_X11)
|
| - // testing/xvfb.py runs xvfb and xcompmgr.
|
| - std::unique_ptr<base::Environment> env(base::Environment::Create());
|
| - bool has_compositing_manager = env->HasVar("_CHROMIUM_INSIDE_XVFB");
|
| + // On Linux, transparent visuals is currently not activated by default.
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| + command_line->AppendSwitch(switches::kEnableTransparentVisuals);
|
| +
|
| int depth = 0;
|
| - ui::ChooseVisualForWindow(has_compositing_manager, NULL, &depth);
|
| -
|
| - if (has_compositing_manager)
|
| - EXPECT_EQ(depth, 32);
|
| + ui::ChooseVisualForWindow(NULL, &depth);
|
| + EXPECT_EQ(depth, 32);
|
| #endif
|
|
|
| init_params.opacity = opacity;
|
| @@ -3759,8 +3758,7 @@
|
| widget.Init(init_params);
|
|
|
| #if defined(USE_X11)
|
| - if (has_compositing_manager)
|
| - EXPECT_TRUE(widget.IsTranslucentWindowOpacitySupported());
|
| + EXPECT_TRUE(widget.IsTranslucentWindowOpacitySupported());
|
| #endif
|
| }
|
|
|
|
|