diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 20:23:44 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 20:23:44 +0000 |
| commit | d2db029ab5a3ee3d103d71447467f7f0074869dc (patch) | |
| tree | 38d2cc560189c0d79493460051764e5a3a5bbd4c /chrome_frame | |
| parent | 48f1e5cb62b299a83d7ae5f897eca0a587abf3f0 (diff) | |
| download | chromium_src-d2db029ab5a3ee3d103d71447467f7f0074869dc.zip chromium_src-d2db029ab5a3ee3d103d71447467f7f0074869dc.tar.gz chromium_src-d2db029ab5a3ee3d103d71447467f7f0074869dc.tar.bz2 | |
Clean up net unit testing code.
(Reapply r72562 with willchan's nits + locally tested shlib fixes + removing duplicate code that was partially responsible for the failure.)
- 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
First Review URL: http://codereview.chromium.org/6264013
Review URL: http://codereview.chromium.org/6248021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_server_test.cc | 2 |
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 { |