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

Side by Side Diff: trunk/src/ui/views/run_all_unittests.cc

Issue 22603007: Revert 216278 "Clean up compositor initialization/destruction." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 months 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 | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "base/test/test_suite.h" 7 #include "base/test/test_suite.h"
8 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/base/ui_base_paths.h" 9 #include "ui/base/ui_base_paths.h"
10 #include "ui/compositor/compositor_setup.h"
10 #include "ui/views/view.h" 11 #include "ui/views/view.h"
11 12
12 class ViewTestSuite : public base::TestSuite { 13 class ViewTestSuite : public base::TestSuite {
13 public: 14 public:
14 ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} 15 ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
15 16
16 protected: 17 protected:
17 virtual void Initialize() OVERRIDE { 18 virtual void Initialize() OVERRIDE {
18 base::TestSuite::Initialize(); 19 base::TestSuite::Initialize();
19 ui::RegisterPathProvider(); 20 ui::RegisterPathProvider();
20 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 21 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
22
23 ui::SetupTestCompositor();
21 } 24 }
22 25
23 private: 26 private:
24 DISALLOW_COPY_AND_ASSIGN(ViewTestSuite); 27 DISALLOW_COPY_AND_ASSIGN(ViewTestSuite);
25 }; 28 };
26 29
27 int main(int argc, char** argv) { 30 int main(int argc, char** argv) {
28 return ViewTestSuite(argc, argv).Run(); 31 return ViewTestSuite(argc, argv).Run();
29 } 32 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698