diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 21:15:21 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 21:15:21 +0000 |
| commit | 87139f73f5774b035071315235456da1b34a436e (patch) | |
| tree | 8f25533387846c9e0f22a2e26ed005c2c618f572 /net | |
| parent | c1dffe83ba4c933b6e5a87edc92780eda101b2b4 (diff) | |
| download | chromium_src-87139f73f5774b035071315235456da1b34a436e.zip chromium_src-87139f73f5774b035071315235456da1b34a436e.tar.gz chromium_src-87139f73f5774b035071315235456da1b34a436e.tar.bz2 | |
Fix build.
TBR=sky
BUG=96594
Review URL: https://codereview.chromium.org/17893012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/test/embedded_test_server/embedded_test_server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc index 3b73545..9cdf21b 100644 --- a/net/test/embedded_test_server/embedded_test_server.cc +++ b/net/test/embedded_test_server/embedded_test_server.cc @@ -68,7 +68,7 @@ scoped_ptr<HttpResponse> HandleFileRequest( if (file_util::PathExists(headers_path)) { std::string headers_contents; if (!file_util::ReadFileToString(headers_path, &headers_contents)) - return scoped_ptr<HttpResponse>(NULL); + return scoped_ptr<HttpResponse>(); scoped_ptr<CustomHttpResponse> http_response( new CustomHttpResponse(headers_contents, file_contents)); |