summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 15:25:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 15:25:53 +0000
commit19d536f25ffa4e876c7af79b201c7330841b31ea (patch)
tree2f64619a8812920692bd3c7e69103727021e9d53 /net
parent6c4e6631acb0893ba00f035792e80942e2b00bd3 (diff)
downloadchromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.zip
chromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.tar.gz
chromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.tar.bz2
Cleanup in base. This moves the implementation (and a bunch of header file
dependencies) from the multiprocess test and the test_suite headers to .cc files. Moves multiprocess_test to the test directory, and all of this stuff to the existing base_test_support project. I also used the base namespace. Previously other projects included this functionality just by #include because it was all inline, so I had to add dependencies on base_test_support in a few places. Moves and renames the command line switch this was using to base_switches. Move the base switch for process type to chrome switches. TEST=none BUG=none Review URL: http://codereview.chromium.org/3026055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/net_test_suite.h2
-rw-r--r--net/base/run_all_unittests.cc1
-rw-r--r--net/net.gyp1
3 files changed, 3 insertions, 1 deletions
diff --git a/net/base/net_test_suite.h b/net/base/net_test_suite.h
index 804db01..eab3a53 100644
--- a/net/base/net_test_suite.h
+++ b/net/base/net_test_suite.h
@@ -11,7 +11,7 @@
#include "base/test/test_suite.h"
#include "net/base/mock_host_resolver.h"
-class NetTestSuite : public TestSuite {
+class NetTestSuite : public base::TestSuite {
public:
NetTestSuite(int argc, char** argv) : TestSuite(argc, argv) {
}
diff --git a/net/base/run_all_unittests.cc b/net/base/run_all_unittests.cc
index 85bda7d..16ecc41 100644
--- a/net/base/run_all_unittests.cc
+++ b/net/base/run_all_unittests.cc
@@ -4,6 +4,7 @@
#include "build/build_config.h"
#include "base/histogram.h"
+#include "base/nss_util.h"
#include "net/base/net_test_suite.h"
#if defined(OS_WIN)
#include "net/socket/ssl_client_socket_nss_factory.h"
diff --git a/net/net.gyp b/net/net.gyp
index fb7b0cc..63b2601 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -658,6 +658,7 @@
'net_test_support',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/zlib/zlib.gyp:zlib',