diff options
| author | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 00:17:02 +0000 |
|---|---|---|
| committer | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 00:17:02 +0000 |
| commit | bf91fe4820a241958ab4f5b64e79978320814540 (patch) | |
| tree | f767262747935d1b27a86ef1b94720c05192642b /net/socket | |
| parent | ea64c0a1403399d5ff6f3ec5cb9856a213ef45d8 (diff) | |
| download | chromium_src-bf91fe4820a241958ab4f5b64e79978320814540.zip chromium_src-bf91fe4820a241958ab4f5b64e79978320814540.tar.gz chromium_src-bf91fe4820a241958ab4f5b64e79978320814540.tar.bz2 | |
Make Objective-C++ compiler happy with net/socket/ssl_test_util.h
BUG=49136 chrome/test/in_process_browser_test.h can not be included in *.mm files.
TEST=none
Review URL: http://codereview.chromium.org/3009004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_test_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/ssl_test_util.h b/net/socket/ssl_test_util.h index cc3e2ce..750bceb 100644 --- a/net/socket/ssl_test_util.h +++ b/net/socket/ssl_test_util.h @@ -54,7 +54,7 @@ class TestServerLauncher { // served out of. This is /files/ by default. // Returns true on success, false if files not found or root cert // not trusted. - bool Start(Protocol protocol, + bool Start(net::TestServerLauncher::Protocol protocol, const std::string& host_name, int port, const FilePath& document_root, const FilePath& cert_path, |