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

Side by Side Diff: ui/views/mus/views_aura_mus_test_suite.cc

Issue 2489903002: Disables tooltip tests for aura-mus-client (Closed)
Patch Set: tweak Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | ui/views/test/platform_test_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/mus/views_aura_mus_test_suite.h" 5 #include "ui/views/mus/views_aura_mus_test_suite.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnection); 171 DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnection);
172 }; 172 };
173 173
174 ViewsAuraMusTestSuite::ViewsAuraMusTestSuite(int argc, char** argv) 174 ViewsAuraMusTestSuite::ViewsAuraMusTestSuite(int argc, char** argv)
175 : ViewsTestSuite(argc, argv) {} 175 : ViewsTestSuite(argc, argv) {}
176 176
177 ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {} 177 ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {}
178 178
179 void ViewsAuraMusTestSuite::Initialize() { 179 void ViewsAuraMusTestSuite::Initialize() {
180 PlatformTestHelper::SetIsMus(); 180 PlatformTestHelper::SetIsAuraMusClient();
181 // Let other services know that we're running in tests. Do this with a 181 // Let other services know that we're running in tests. Do this with a
182 // command line flag to avoid making blocking calls to other processes for 182 // command line flag to avoid making blocking calls to other processes for
183 // setup for tests (e.g. to unlock the screen in the window manager). 183 // setup for tests (e.g. to unlock the screen in the window manager).
184 EnsureCommandLineSwitch(ui::switches::kUseTestConfig); 184 EnsureCommandLineSwitch(ui::switches::kUseTestConfig);
185 185
186 ViewsTestSuite::Initialize(); 186 ViewsTestSuite::Initialize();
187 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>(); 187 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>();
188 } 188 }
189 189
190 void ViewsAuraMusTestSuite::Shutdown() { 190 void ViewsAuraMusTestSuite::Shutdown() {
191 service_manager_connections_.reset(); 191 service_manager_connections_.reset();
192 ViewsTestSuite::Shutdown(); 192 ViewsTestSuite::Shutdown();
193 } 193 }
194 194
195 } // namespace views 195 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | ui/views/test/platform_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698