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

Side by Side Diff: chrome/test/base/interactive_ui_tests_main.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 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
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/view_event_test_base.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/test/base/chrome_test_launcher.h" 5 #include "chrome/test/base/chrome_test_launcher.h"
6 6
7 #include "chrome/test/base/chrome_test_suite.h" 7 #include "chrome/test/base/chrome_test_suite.h"
8 #include "ui/base/test/ui_controls.h" 8 #include "ui/base/test/ui_controls.h"
9 9
10 #if defined(USE_AURA) 10 #if defined(USE_AURA)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #endif 53 #endif
54 #endif 54 #endif
55 } 55 }
56 56
57 virtual void Shutdown() OVERRIDE { 57 virtual void Shutdown() OVERRIDE {
58 #if defined(OS_WIN) 58 #if defined(OS_WIN)
59 com_initializer_.reset(); 59 com_initializer_.reset();
60 #endif 60 #endif
61 } 61 }
62 62
63 virtual bool IsBrowserTestSuite() OVERRIDE { return false; }
64
65 private: 63 private:
66 #if defined(OS_WIN) 64 #if defined(OS_WIN)
67 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; 65 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
68 #endif 66 #endif
69 }; 67 };
70 68
71 class InteractiveUITestSuiteRunner : public ChromeTestSuiteRunner { 69 class InteractiveUITestSuiteRunner : public ChromeTestSuiteRunner {
72 public: 70 public:
73 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { 71 virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
74 return InteractiveUITestSuite(argc, argv).Run(); 72 return InteractiveUITestSuite(argc, argv).Run();
75 } 73 }
76 }; 74 };
77 75
78 int main(int argc, char** argv) { 76 int main(int argc, char** argv) {
79 // Run interactive_ui_tests serially, they do not support running in parallel. 77 // Run interactive_ui_tests serially, they do not support running in parallel.
80 int default_jobs = 1; 78 int default_jobs = 1;
81 InteractiveUITestSuiteRunner runner; 79 InteractiveUITestSuiteRunner runner;
82 return LaunchChromeTests(default_jobs, &runner, argc, argv); 80 return LaunchChromeTests(default_jobs, &runner, argc, argv);
83 } 81 }
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/view_event_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698