| Index: chrome/test/unit/chrome_test_suite.h
|
| ===================================================================
|
| --- chrome/test/unit/chrome_test_suite.h (revision 55077)
|
| +++ chrome/test/unit/chrome_test_suite.h (working copy)
|
| @@ -12,9 +12,11 @@
|
|
|
| #include "app/app_paths.h"
|
| #include "app/resource_bundle.h"
|
| +#include "base/command_line.h"
|
| #include "base/stats_table.h"
|
| #include "base/file_util.h"
|
| #include "base/path_service.h"
|
| +#include "base/process_util.h"
|
| #include "base/ref_counted.h"
|
| #include "base/scoped_nsautorelease_pool.h"
|
| #include "base/test/test_suite.h"
|
| @@ -28,6 +30,7 @@
|
| #include "chrome/test/testing_browser_process.h"
|
| #include "net/base/mock_host_resolver.h"
|
| #include "net/base/net_util.h"
|
| +#include "testing/gtest/include/gtest/gtest.h"
|
|
|
| #if defined(OS_MACOSX)
|
| #include "base/mac_util.h"
|
| @@ -81,10 +84,10 @@
|
| }
|
| };
|
|
|
| -class ChromeTestSuite : public TestSuite {
|
| +class ChromeTestSuite : public base::TestSuite {
|
| public:
|
| ChromeTestSuite(int argc, char** argv)
|
| - : TestSuite(argc, argv),
|
| + : base::TestSuite(argc, argv),
|
| stats_table_(NULL),
|
| created_user_data_dir_(false) {
|
| }
|
| @@ -94,7 +97,7 @@
|
| virtual void Initialize() {
|
| base::ScopedNSAutoreleasePool autorelease_pool;
|
|
|
| - TestSuite::Initialize();
|
| + base::TestSuite::Initialize();
|
|
|
| chrome::RegisterChromeSchemes();
|
| host_resolver_proc_ = new WarningHostResolverProc();
|
| @@ -172,7 +175,7 @@
|
| file_util::Delete(user_data_dir, true);
|
| file_util::Delete(user_data_dir.DirName(), false);
|
| }
|
| - TestSuite::Shutdown();
|
| + base::TestSuite::Shutdown();
|
| }
|
|
|
| void SetBrowserDirectory(const FilePath& browser_dir) {
|
|
|