diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 23:59:18 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 23:59:18 +0000 |
| commit | e64acae98b10447395df572775c807b985d972a8 (patch) | |
| tree | e278409c1be583e612b6ef2e9e68d2c3cf1f1b57 /net | |
| parent | 08bbee2afc2bfbe44bfb3f8edfad802691c5c1f8 (diff) | |
| download | chromium_src-e64acae98b10447395df572775c807b985d972a8.zip chromium_src-e64acae98b10447395df572775c807b985d972a8.tar.gz chromium_src-e64acae98b10447395df572775c807b985d972a8.tar.bz2 | |
Try to fix a compile error on ARM.
This is a speculative change, to hopefully get the ARM builder compiling again.
Lately it has been giving the error that |kHandshakeResponseMessage| is being used before it is initialized:
http://build.chromium.org/buildbot/waterfall/builders/Chromium%20Arm/builds/2639/steps/compile/logs/stdio
I don't know why it would say this, but perhaps it is getting confused by the multiple statics with the same name in this file.
My proposed change removes the static keyword, to see if it has an effect.
TBR=ukai
Review URL: http://codereview.chromium.org/1217003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/websockets/websocket_job_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index 7bf9822..8a32be0 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -265,7 +265,7 @@ TEST_F(WebSocketJobTest, SimpleHandshake) { websocket_->OnSentData(socket_.get(), strlen(kHandshakeRequestMessage)); EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent()); - static const char* kHandshakeResponseMessage = + const char kHandshakeResponseMessage[] = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n" "Upgrade: WebSocket\r\n" "Connection: Upgrade\r\n" @@ -323,7 +323,7 @@ TEST_F(WebSocketJobTest, SlowHandshake) { EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent()); EXPECT_EQ(WebSocketJob::CONNECTING, GetWebSocketJobState()); - static const char* kHandshakeResponseMessage = + const char kHandshakeResponseMessage[] = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n" "Upgrade: WebSocket\r\n" "Connection: Upgrade\r\n" @@ -393,7 +393,7 @@ TEST_F(WebSocketJobTest, HandshakeWithCookie) { websocket_->OnSentData(socket_, strlen(kHandshakeRequestExpected)); EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent()); - static const char* kHandshakeResponseMessage = + const char kHandshakeResponseMessage[] = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n" "Upgrade: WebSocket\r\n" "Connection: Upgrade\r\n" @@ -472,7 +472,7 @@ TEST_F(WebSocketJobTest, HandshakeWithCookieButNotAllowed) { websocket_->OnSentData(socket_, strlen(kHandshakeRequestExpected)); EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent()); - static const char* kHandshakeResponseMessage = + const char kHandshakeResponseMessage[] = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n" "Upgrade: WebSocket\r\n" "Connection: Upgrade\r\n" |