Skip to content

Commit

Permalink
ozone: //apps remove Ozone feature from switches
Browse files Browse the repository at this point in the history
USE_X11 is deprecated and Ozone is default on Linux. Thus,
there is no need to pass --enable-features=UseOzonePlatform
anymore. Thus, remove the change that was added in
https://crrev.com/c/2346355

Bug: 1096425
Change-Id: I5bde643e027e8a83ee5f8cc9d9f2ce677b7d6956
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3185904
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/main@{#925634}
  • Loading branch information
msisov authored and Chromium LUCI CQ committed Sep 28, 2021
1 parent 2f6a24a commit 728ef0a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
3 changes: 0 additions & 3 deletions apps/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,4 @@ specific_include_rules = {
# To access sandbox includes.
"+sandbox/policy",
],
"load_and_launch_browsertest.cc": [
"+ui/ozone/public/ozone_switches.h"
],
}
18 changes: 0 additions & 18 deletions apps/load_and_launch_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
// and when chrome is started from scratch.

#include "apps/switches.h"
#include "base/base_switches.h"
#include "base/cxx17_backports.h"
#include "base/process/launch.h"
#include "base/strings/utf_string_conversions.h"
Expand All @@ -29,10 +28,6 @@
#include "extensions/test/extension_test_message_listener.h"
#include "sandbox/policy/switches.h"

#if defined(USE_OZONE)
#include "ui/ozone/public/ozone_switches.h"
#endif

using extensions::PlatformAppBrowserTest;

namespace apps {
Expand All @@ -48,19 +43,6 @@ constexpr char kTestExtensionId[] = "behllobkkfkfnphdnhnkndlbkcpglgmj";
const char* kSwitchesToCopy[] = {
sandbox::policy::switches::kNoSandbox,
switches::kUserDataDir,
#if defined(USE_OZONE)
// Keep the kOzonePlatform switch that the Ozone must use.
switches::kOzonePlatform,
#endif
// Some tests use custom cmdline that doesn't hold switches from previous
// cmdline. Only a couple of switches are copied. That can result in
// incorrect initialization of a process. For example, the work that we do
// to have use_x11 && use_ozone, requires UseOzonePlatform feature flag to
// be passed to all the process to ensure correct path is chosen.
// TODO(https://crbug.com/1096425): update this comment once USE_X11 goes
// away.
switches::kEnableFeatures,
switches::kDisableFeatures,
};

// TODO(jackhou): Enable this test once it works on OSX. It currently does not
Expand Down

0 comments on commit 728ef0a

Please sign in to comment.