diff options
Diffstat (limited to 'chrome/test/unit/chrome_test_suite.h')
-rw-r--r-- | chrome/test/unit/chrome_test_suite.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index b788879..1cdd90f 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -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 WarningHostResolverProc : public net::HostResolverProc { } }; -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 @@ class ChromeTestSuite : public TestSuite { virtual void Initialize() { base::ScopedNSAutoreleasePool autorelease_pool; - TestSuite::Initialize(); + base::TestSuite::Initialize(); chrome::RegisterChromeSchemes(); host_resolver_proc_ = new WarningHostResolverProc(); @@ -172,7 +175,7 @@ class ChromeTestSuite : public TestSuite { 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) { |