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

Unified Diff: chrome/test/unit/chrome_test_suite.h

Issue 3035062: Revert 55400 - Cleanup in base. This moves the implementation (and a bunch of... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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/test_launcher/test_runner.cc ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/unit/chrome_test_suite.h
===================================================================
--- chrome/test/unit/chrome_test_suite.h (revision 55415)
+++ chrome/test/unit/chrome_test_suite.h (working copy)
@@ -12,11 +12,9 @@
#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"
@@ -30,7 +28,6 @@
#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"
@@ -84,10 +81,10 @@
}
};
-class ChromeTestSuite : public base::TestSuite {
+class ChromeTestSuite : public TestSuite {
public:
ChromeTestSuite(int argc, char** argv)
- : base::TestSuite(argc, argv),
+ : TestSuite(argc, argv),
stats_table_(NULL),
created_user_data_dir_(false) {
}
@@ -97,7 +94,7 @@
virtual void Initialize() {
base::ScopedNSAutoreleasePool autorelease_pool;
- base::TestSuite::Initialize();
+ TestSuite::Initialize();
chrome::RegisterChromeSchemes();
host_resolver_proc_ = new WarningHostResolverProc();
@@ -175,7 +172,7 @@
file_util::Delete(user_data_dir, true);
file_util::Delete(user_data_dir.DirName(), false);
}
- base::TestSuite::Shutdown();
+ TestSuite::Shutdown();
}
void SetBrowserDirectory(const FilePath& browser_dir) {
« no previous file with comments | « chrome/test/test_launcher/test_runner.cc ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698