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

Issue 2807833002: [views-mus] Prevent creating a native OzonePlatform in mus tests. (Closed)

Created:
3 years, 8 months ago by Elliot Glaysher
Modified:
3 years, 8 months ago
Reviewers:
sky
CC:
chromium-reviews, kalyank, sadrul, tfarina
Target Ref:
refs/heads/master
Project:
chromium
Visibility:
Public.

Description

[views-mus] Prevent creating a native OzonePlatform in mus tests. In the views_mus_unittests, we were always creating a native OzonePlatform instance. Sometimes this was used instead of mus for the test body. In most cases, it was accessed during test setup. This modifies the test code to not build an implicit OzonePlatform. In normal mus builds of chrome, we do not run with an OzonePlatform and instead manually initialize some of the objects that OzonePlatform owns. This ensures that AuraTestHelper doesn't create a local implementation using the same detection method that Env uses to flip into aura-mus mode. BUG=705037, 710195, 710939 Review-Url: https://codereview.chromium.org/2807833002 Cr-Commit-Position: refs/heads/master@{#464147} Committed: https://chromium.googlesource.com/chromium/src/+/ac2e0aeea11a2641dfca4d1b192bd1641b5cd5d3

Patch Set 1 #

Patch Set 2 : Prevent mac from building files it can't handle #

Patch Set 3 : Use the same detection method at all levels. #

Total comments: 9

Patch Set 4 : Make the initialization of Env in views_mus_unittests MUS initially. #

Patch Set 5 : And make mash_unittests work too #

Patch Set 6 : sky comments #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+116 lines, -51 lines) Patch
M ash/system/status_area_widget_unittest.cc View 1 2 3 4 2 chunks +16 lines, -6 lines 0 comments Download
M ui/aura/env.cc View 1 2 3 2 chunks +1 line, -7 lines 0 comments Download
M ui/aura/mus/os_exchange_data_provider_mus_unittest.cc View 1 2 3 2 chunks +4 lines, -1 line 0 comments Download
M ui/aura/test/aura_test_helper.cc View 1 2 3 4 5 3 chunks +32 lines, -28 lines 0 comments Download
M ui/base/dragdrop/os_exchange_data_provider_factory.h View 1 2 3 1 chunk +3 lines, -0 lines 2 comments Download
M ui/base/dragdrop/os_exchange_data_provider_factory.cc View 1 2 3 1 chunk +8 lines, -0 lines 0 comments Download
M ui/keyboard/keyboard_controller.cc View 1 2 3 4 1 chunk +4 lines, -3 lines 0 comments Download
M ui/views/BUILD.gn View 1 2 3 4 5 4 chunks +13 lines, -4 lines 0 comments Download
M ui/views/mus/views_mus_test_suite.h View 1 2 3 1 chunk +4 lines, -0 lines 0 comments Download
M ui/views/mus/views_mus_test_suite.cc View 1 2 3 1 chunk +8 lines, -0 lines 0 comments Download
M ui/views/test/widget_test_unittest.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M ui/views/views_test_suite.h View 1 2 3 1 chunk +6 lines, -0 lines 0 comments Download
M ui/views/views_test_suite.cc View 1 2 3 1 chunk +12 lines, -2 lines 0 comments Download

Messages

Total messages: 43 (35 generated)
Elliot Glaysher
We mostly work when we ensure that we aren't using the local aura method. I've ...
3 years, 8 months ago (2017-04-10 23:46:14 UTC) #20
sky
https://codereview.chromium.org/2807833002/diff/40001/ui/aura/test/aura_test_helper.cc File ui/aura/test/aura_test_helper.cc (right): https://codereview.chromium.org/2807833002/diff/40001/ui/aura/test/aura_test_helper.cc#newcode52 ui/aura/test/aura_test_helper.cc:52: "primordial-pipe-token"); Use kPrimordialPipeToken? https://codereview.chromium.org/2807833002/diff/40001/ui/aura/test/aura_test_helper.cc#newcode136 ui/aura/test/aura_test_helper.cc:136: // TODO(sky): creating the ...
3 years, 8 months ago (2017-04-10 23:53:26 UTC) #21
Elliot Glaysher
https://codereview.chromium.org/2807833002/diff/40001/ui/aura/test/aura_test_helper.cc File ui/aura/test/aura_test_helper.cc (right): https://codereview.chromium.org/2807833002/diff/40001/ui/aura/test/aura_test_helper.cc#newcode52 ui/aura/test/aura_test_helper.cc:52: "primordial-pipe-token"); On 2017/04/10 23:53:26, sky wrote: > Use kPrimordialPipeToken? ...
3 years, 8 months ago (2017-04-12 18:09:16 UTC) #32
sky
LGTM https://codereview.chromium.org/2807833002/diff/100001/ui/base/dragdrop/os_exchange_data_provider_factory.h File ui/base/dragdrop/os_exchange_data_provider_factory.h (right): https://codereview.chromium.org/2807833002/diff/100001/ui/base/dragdrop/os_exchange_data_provider_factory.h#newcode29 ui/base/dragdrop/os_exchange_data_provider_factory.h:29: static Factory* TakeFactory(); Can this return a std::unique_ptr?
3 years, 8 months ago (2017-04-12 19:38:15 UTC) #35
Elliot Glaysher
https://codereview.chromium.org/2807833002/diff/100001/ui/base/dragdrop/os_exchange_data_provider_factory.h File ui/base/dragdrop/os_exchange_data_provider_factory.h (right): https://codereview.chromium.org/2807833002/diff/100001/ui/base/dragdrop/os_exchange_data_provider_factory.h#newcode29 ui/base/dragdrop/os_exchange_data_provider_factory.h:29: static Factory* TakeFactory(); On 2017/04/12 19:38:15, sky wrote: > ...
3 years, 8 months ago (2017-04-12 19:52:26 UTC) #36
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2807833002/100001
3 years, 8 months ago (2017-04-12 19:53:36 UTC) #38
sky
Fair enough. On Wed, Apr 12, 2017 at 12:52 PM, <erg@chromium.org> wrote: > > https://codereview.chromium.org/2807833002/diff/100001/ui/ ...
3 years, 8 months ago (2017-04-12 19:53:40 UTC) #39
commit-bot: I haz the power
3 years, 8 months ago (2017-04-12 20:55:59 UTC) #43
Message was sent while issue was closed.
Committed patchset #6 (id:100001) as
https://chromium.googlesource.com/chromium/src/+/ac2e0aeea11a2641dfca4d1b192b...

Powered by Google App Engine
This is Rietveld 408576698