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

Unified Diff: base/test/test_suite.h

Issue 8907054: Enable ChromeFrame net tests for IE versions 8 and below. Changes include the following:- (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | « no previous file | base/test/test_suite.cc » ('j') | base/test/test_suite.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_suite.h
===================================================================
--- base/test/test_suite.h (revision 114513)
+++ base/test/test_suite.h (working copy)
@@ -13,6 +13,7 @@
#include <string>
#include "base/at_exit.h"
+#include "base/memory/scoped_ptr.h"
namespace testing {
class TestInfo;
@@ -59,6 +60,11 @@
static const char kStrictFailureHandling[];
protected:
+ // This constructor is only accessible to specialized test suite
+ // implementations which need to control the creation of an AtExitManager
+ // instance for the duration of the test.
+ TestSuite(int argc, char** argv, bool create_at_exit_manager);
+
// By default fatal log messages (e.g. from DCHECKs) result in error dialogs
// which gum up buildbots. Use a minimalistic assert handler which just
// terminates the process.
@@ -75,8 +81,12 @@
// Make sure that we setup an AtExitManager so Singleton objects will be
// destroyed.
- base::AtExitManager at_exit_manager_;
+ scoped_ptr<base::AtExitManager> at_exit_manager_;
+ private:
+ // Basic initialization for the test suite happens here.
+ void PreInitialize(int argc, char** argv, bool create_at_exit_manager);
+
DISALLOW_COPY_AND_ASSIGN(TestSuite);
};
« no previous file with comments | « no previous file | base/test/test_suite.cc » ('j') | base/test/test_suite.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698