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

Unified Diff: chrome/test/base/chrome_unit_test_suite.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/chrome_test_suite.cc ('k') | chrome/test/base/chrome_unit_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/chrome_unit_test_suite.h
===================================================================
--- chrome/test/base/chrome_unit_test_suite.h (revision 257432)
+++ chrome/test/base/chrome_unit_test_suite.h (working copy)
@@ -7,8 +7,13 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/files/file_path.h"
#include "chrome/test/base/chrome_test_suite.h"
+namespace base {
+class StatsTable;
+}
+
// Test suite for unit tests. Creates additional stub services that are not
// needed for browser tests (e.g. a TestingBrowserProcess).
class ChromeUnitTestSuite : public ChromeTestSuite {
@@ -18,11 +23,18 @@
// base::TestSuite overrides:
virtual void Initialize() OVERRIDE;
+ virtual void Shutdown() OVERRIDE;
- // ChromeTestSuite overrides:
- virtual bool IsBrowserTestSuite() OVERRIDE;
+ // These methods allow unit tests which run in the browser_test binary, and so
+ // which don't exercise the initialization in this test suite, to do basic
+ // setup which this class does.
+ static void InitializeProviders();
+ static void InitializeResourceBundle();
private:
+ std::string stats_filename_;
+ scoped_ptr<base::StatsTable> stats_table_;
+
DISALLOW_COPY_AND_ASSIGN(ChromeUnitTestSuite);
};
« no previous file with comments | « chrome/test/base/chrome_test_suite.cc ('k') | chrome/test/base/chrome_unit_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698