| Index: chrome/test/base/chrome_test_suite.h
|
| diff --git a/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h
|
| index 707e030dc10500a24379d63ea89ffef5b5812472..9337b7ef98a274da8e916a7e7bfe0ba11ecf3deb 100644
|
| --- a/chrome/test/base/chrome_test_suite.h
|
| +++ b/chrome/test/base/chrome_test_suite.h
|
| @@ -10,7 +10,7 @@
|
|
|
| #include "base/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/test/test_suite.h"
|
| +#include "content/test/content_test_suite_base.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "ui/base/win/scoped_ole_initializer.h"
|
| @@ -20,7 +20,7 @@ namespace base {
|
| class StatsTable;
|
| }
|
|
|
| -class ChromeTestSuite : public base::TestSuite {
|
| +class ChromeTestSuite : public content::ContentTestSuiteBase {
|
| public:
|
| // Make the browser_test binary launch as a regular browser.
|
| static const char kLaunchAsBrowser[];
|
| @@ -32,6 +32,8 @@ class ChromeTestSuite : public base::TestSuite {
|
| virtual void Initialize() OVERRIDE;
|
| virtual void Shutdown() OVERRIDE;
|
|
|
| + virtual content::ContentClient* CreateClientForInitialization() OVERRIDE;
|
| +
|
| void SetBrowserDirectory(const FilePath& browser_dir) {
|
| browser_dir_ = browser_dir;
|
| }
|
|
|