summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 23:48:06 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 23:48:06 +0000
commit472ce96a4b839814ed93c26d35d07c78de019b17 (patch)
tree8355f2a490ce20c4be7485f40505544e3d602a26 /chrome_frame
parentb597956cd427a3b830a498c69602753ce6117119 (diff)
downloadchromium_src-472ce96a4b839814ed93c26d35d07c78de019b17.zip
chromium_src-472ce96a4b839814ed93c26d35d07c78de019b17.tar.gz
chromium_src-472ce96a4b839814ed93c26d35d07c78de019b17.tar.bz2
Clean up net unit testing code.
- Move code included from blah_unittest.h (where blah_unittest.cc has actual unittests) into their own files, often completely out-of-lining the definitions. - Remove anonymous namespaces from headers. - Reorder method declarations. - Make other unit test link against net_test_support instead of reaching in and including .h files in their targets directly. BUG=68682 TEST=compiles Review URL: http://codereview.chromium.org/6264013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp2
-rw-r--r--chrome_frame/test/test_server_test.cc2
2 files changed, 1 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index e1596c8..bfc88f3 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -484,8 +484,6 @@
'npchrome_frame',
],
'sources': [
- '../net/url_request/url_request_unittest.cc',
- '../net/url_request/url_request_unittest.h',
'test/chrome_frame_test_utils.cc',
'test/chrome_frame_test_utils.h',
'test/simulate_input.cc',
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index f273dce..1355471 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -16,7 +16,7 @@
#include "net/http/http_cache.h"
#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
class TestServerTest: public testing::Test {