Update Chromium to beta version 37.0.2062.68

Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

19 files changed, 140 insertions, 82 deletions

diff --git a/chromium/jingle/OWNERS b/chromium/jingle/OWNERS
index 8d4af2209bc..56688d81cf2 100644
--- a/chromium/jingle/OWNERS
+++ b/chromium/jingle/OWNERS
@@ -1,6 +1,4 @@
 ajwong@chromium.org
-akalin@chromium.org
 hclam@chromium.org
-sanjeevr@chromium.org
 sergeyu@chromium.org
 zea@chromium.org
diff --git a/chromium/jingle/PRESUBMIT.py b/chromium/jingle/PRESUBMIT.py
index 1ed6464075e..4ef2a1b35e2 100644
--- a/chromium/jingle/PRESUBMIT.py
+++ b/chromium/jingle/PRESUBMIT.py
@@ -8,9 +8,11 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details on the presubmit API built into gcl.
 """
 
-def GetPreferredTrySlaves():
-  return [
-    'linux_rel:sync_integration_tests',
-    'mac_rel:sync_integration_tests',
-    'win_rel:sync_integration_tests',
-  ]
+def GetPreferredTryMasters(project, change):
+  return {
+    'tryserver.chromium': {
+      'linux_chromium_rel': set(['defaulttests']),
+      'mac_chromium_rel': set(['defaulttests']),
+      'win_chromium_rel': set(['defaulttests']),
+    }
+  }
diff --git a/chromium/jingle/glue/channel_socket_adapter.cc b/chromium/jingle/glue/channel_socket_adapter.cc
index c9cfff1ca14..bca4222aaeb 100644
--- a/chromium/jingle/glue/channel_socket_adapter.cc
+++ b/chromium/jingle/glue/channel_socket_adapter.cc
@@ -76,9 +76,9 @@ int TransportChannelSocketAdapter::Write(
   }
 
   int result;
+  talk_base::PacketOptions options;
   if (channel_->writable()) {
-    result = channel_->SendPacket(buffer->data(), buffer_size,
-                                  talk_base::DSCP_NO_CHANGE);
+    result = channel_->SendPacket(buffer->data(), buffer_size, options);
     if (result < 0) {
       result = net::MapSystemError(channel_->GetError());
 
@@ -99,14 +99,16 @@ int TransportChannelSocketAdapter::Write(
   return result;
 }
 
-bool TransportChannelSocketAdapter::SetReceiveBufferSize(int32 size) {
+int TransportChannelSocketAdapter::SetReceiveBufferSize(int32 size) {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
-  return channel_->SetOption(talk_base::Socket::OPT_RCVBUF, size) == 0;
+  return (channel_->SetOption(talk_base::Socket::OPT_RCVBUF, size) == 0) ?
+      net::OK : net::ERR_SOCKET_SET_RECEIVE_BUFFER_SIZE_ERROR;
 }
 
-bool TransportChannelSocketAdapter::SetSendBufferSize(int32 size) {
+int TransportChannelSocketAdapter::SetSendBufferSize(int32 size) {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
-  return channel_->SetOption(talk_base::Socket::OPT_SNDBUF, size) == 0;
+  return (channel_->SetOption(talk_base::Socket::OPT_SNDBUF, size) == 0) ?
+      net::OK : net::ERR_SOCKET_SET_SEND_BUFFER_SIZE_ERROR;
 }
 
 void TransportChannelSocketAdapter::Close(int error_code) {
@@ -172,9 +174,10 @@ void TransportChannelSocketAdapter::OnWritableState(
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   // Try to send the packet if there is a pending write.
   if (!write_callback_.is_null()) {
+    talk_base::PacketOptions options;
     int result = channel_->SendPacket(write_buffer_->data(),
                                       write_buffer_size_,
-                                      talk_base::DSCP_NO_CHANGE);
+                                      options);
     if (result < 0)
       result = net::MapSystemError(channel_->GetError());
 
diff --git a/chromium/jingle/glue/channel_socket_adapter.h b/chromium/jingle/glue/channel_socket_adapter.h
index 35414a18d95..fc90df927db 100644
--- a/chromium/jingle/glue/channel_socket_adapter.h
+++ b/chromium/jingle/glue/channel_socket_adapter.h
@@ -48,8 +48,8 @@ class TransportChannelSocketAdapter : public net::Socket,
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     const net::CompletionCallback& callback) OVERRIDE;
 
-  virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual bool SetSendBufferSize(int32 size) OVERRIDE;
+  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
+  virtual int SetSendBufferSize(int32 size) OVERRIDE;
 
  private:
   void OnNewPacket(cricket::TransportChannel* channel,
diff --git a/chromium/jingle/glue/channel_socket_adapter_unittest.cc b/chromium/jingle/glue/channel_socket_adapter_unittest.cc
index 7fcb5d1d6f2..436f8f70f5f 100644
--- a/chromium/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/chromium/jingle/glue/channel_socket_adapter_unittest.cc
@@ -36,7 +36,7 @@ class MockTransportChannel : public cricket::TransportChannel {
 
   MOCK_METHOD4(SendPacket, int(const char* data,
                                size_t len,
-                               talk_base::DiffServCodePoint dscp,
+                               const talk_base::PacketOptions& options,
                                int flags));
   MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
   MOCK_METHOD0(GetError, int());
@@ -111,8 +111,7 @@ TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
 TEST_F(TransportChannelSocketAdapterTest, Write) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
-                                   talk_base::DSCP_NO_CHANGE, 0))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, _, 0))
       .WillOnce(Return(kTestDataSize));
 
   int result = target_->Write(buffer.get(), kTestDataSize, callback_);
@@ -124,8 +123,7 @@ TEST_F(TransportChannelSocketAdapterTest, Write) {
 TEST_F(TransportChannelSocketAdapterTest, WritePending) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
-                                   talk_base::DSCP_NO_CHANGE, 0))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, _, 0))
       .Times(1)
       .WillOnce(Return(SOCKET_ERROR));
 
diff --git a/chromium/jingle/glue/fake_socket_factory.cc b/chromium/jingle/glue/fake_socket_factory.cc
index 38472c6f41a..570c22fee31 100644
--- a/chromium/jingle/glue/fake_socket_factory.cc
+++ b/chromium/jingle/glue/fake_socket_factory.cc
@@ -35,14 +35,14 @@ talk_base::SocketAddress FakeUDPPacketSocket::GetRemoteAddress() const {
 }
 
 int FakeUDPPacketSocket::Send(const void *data, size_t data_size,
-                              talk_base::DiffServCodePoint dscp) {
+                              const talk_base::PacketOptions& options) {
   DCHECK(CalledOnValidThread());
-  return SendTo(data, data_size, remote_address_, dscp);
+  return SendTo(data, data_size, remote_address_, options);
 }
 
 int FakeUDPPacketSocket::SendTo(const void *data, size_t data_size,
                                 const talk_base::SocketAddress& address,
-                                talk_base::DiffServCodePoint dscp) {
+                                const talk_base::PacketOptions& options) {
   DCHECK(CalledOnValidThread());
 
   if (state_ == IS_CLOSED) {
diff --git a/chromium/jingle/glue/fake_socket_factory.h b/chromium/jingle/glue/fake_socket_factory.h
index e9af78de3fa..b46cdc64b45 100644
--- a/chromium/jingle/glue/fake_socket_factory.h
+++ b/chromium/jingle/glue/fake_socket_factory.h
@@ -39,10 +39,10 @@ class FakeUDPPacketSocket : public talk_base::AsyncPacketSocket,
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
   virtual int Send(const void *pv, size_t cb,
-                   talk_base::DiffServCodePoint dscp) OVERRIDE;
+                   const talk_base::PacketOptions& options) OVERRIDE;
   virtual int SendTo(const void *pv, size_t cb,
                      const talk_base::SocketAddress& addr,
-                     talk_base::DiffServCodePoint dscp) OVERRIDE;
+                     const talk_base::PacketOptions& options) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
   virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
diff --git a/chromium/jingle/glue/fake_ssl_client_socket.cc b/chromium/jingle/glue/fake_ssl_client_socket.cc
index 9d722c7861b..4cc68671824 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket.cc
+++ b/chromium/jingle/glue/fake_ssl_client_socket.cc
@@ -103,11 +103,11 @@ int FakeSSLClientSocket::Write(net::IOBuffer* buf, int buf_len,
   return transport_socket_->Write(buf, buf_len, callback);
 }
 
-bool FakeSSLClientSocket::SetReceiveBufferSize(int32 size) {
+int FakeSSLClientSocket::SetReceiveBufferSize(int32 size) {
   return transport_socket_->SetReceiveBufferSize(size);
 }
 
-bool FakeSSLClientSocket::SetSendBufferSize(int32 size) {
+int FakeSSLClientSocket::SetSendBufferSize(int32 size) {
   return transport_socket_->SetSendBufferSize(size);
 }
 
diff --git a/chromium/jingle/glue/fake_ssl_client_socket.h b/chromium/jingle/glue/fake_ssl_client_socket.h
index 54a9e2f2b1b..41000f726a7 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket.h
+++ b/chromium/jingle/glue/fake_ssl_client_socket.h
@@ -49,8 +49,8 @@ class FakeSSLClientSocket : public net::StreamSocket {
                    const net::CompletionCallback& callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     const net::CompletionCallback& callback) OVERRIDE;
-  virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual bool SetSendBufferSize(int32 size) OVERRIDE;
+  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
+  virtual int SetSendBufferSize(int32 size) OVERRIDE;
   virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
diff --git a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
index f6d8fea5fb3..a2981eb2bd4 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
+++ b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -50,8 +50,8 @@ class MockClientSocket : public net::StreamSocket {
                          const net::CompletionCallback&));
   MOCK_METHOD3(Write, int(net::IOBuffer*, int,
                           const net::CompletionCallback&));
-  MOCK_METHOD1(SetReceiveBufferSize, bool(int32));
-  MOCK_METHOD1(SetSendBufferSize, bool(int32));
+  MOCK_METHOD1(SetReceiveBufferSize, int(int32));
+  MOCK_METHOD1(SetSendBufferSize, int(int32));
   MOCK_METHOD1(Connect, int(const net::CompletionCallback&));
   MOCK_METHOD0(Disconnect, void());
   MOCK_CONST_METHOD0(IsConnected, bool());
diff --git a/chromium/jingle/glue/proxy_resolving_client_socket.cc b/chromium/jingle/glue/proxy_resolving_client_socket.cc
index d63411bdc60..7622c218a22 100644
--- a/chromium/jingle/glue/proxy_resolving_client_socket.cc
+++ b/chromium/jingle/glue/proxy_resolving_client_socket.cc
@@ -70,16 +70,23 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
   const net::HttpNetworkSession::Params* reference_params =
       request_context->GetNetworkSessionParams();
   if (reference_params) {
+    // TODO(mmenke):  Just copying specific parameters seems highly regression
+    // prone.  Should have a better way to do this.
     session_params.host_mapping_rules = reference_params->host_mapping_rules;
     session_params.ignore_certificate_errors =
         reference_params->ignore_certificate_errors;
-    session_params.http_pipelining_enabled =
-        reference_params->http_pipelining_enabled;
     session_params.testing_fixed_http_port =
         reference_params->testing_fixed_http_port;
     session_params.testing_fixed_https_port =
         reference_params->testing_fixed_https_port;
+    session_params.next_protos = reference_params->next_protos;
     session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;
+    session_params.force_spdy_over_ssl = reference_params->force_spdy_over_ssl;
+    session_params.force_spdy_always = reference_params->force_spdy_always;
+    session_params.forced_spdy_exclusions =
+        reference_params->forced_spdy_exclusions;
+    session_params.use_alternate_protocols =
+        reference_params->use_alternate_protocols;
   }
 
   network_session_ = new net::HttpNetworkSession(session_params);
@@ -107,18 +114,18 @@ int ProxyResolvingClientSocket::Write(
   return net::ERR_SOCKET_NOT_CONNECTED;
 }
 
-bool ProxyResolvingClientSocket::SetReceiveBufferSize(int32 size) {
+int ProxyResolvingClientSocket::SetReceiveBufferSize(int32 size) {
   if (transport_.get() && transport_->socket())
     return transport_->socket()->SetReceiveBufferSize(size);
   NOTREACHED();
-  return false;
+  return net::ERR_SOCKET_NOT_CONNECTED;
 }
 
-bool ProxyResolvingClientSocket::SetSendBufferSize(int32 size) {
+int ProxyResolvingClientSocket::SetSendBufferSize(int32 size) {
   if (transport_.get() && transport_->socket())
     return transport_->socket()->SetSendBufferSize(size);
   NOTREACHED();
-  return false;
+  return net::ERR_SOCKET_NOT_CONNECTED;
 }
 
 int ProxyResolvingClientSocket::Connect(
@@ -192,7 +199,7 @@ void ProxyResolvingClientSocket::ProcessProxyResolveDone(int status) {
   // Now that we have resolved the proxy, we need to connect.
   status = net::InitSocketHandleForRawConnect(
       dest_host_port_pair_, network_session_.get(), proxy_info_, ssl_config_,
-      ssl_config_, net::kPrivacyModeDisabled, bound_net_log_, transport_.get(),
+      ssl_config_, net::PRIVACY_MODE_DISABLED, bound_net_log_, transport_.get(),
       connect_callback_);
   if (status != net::ERR_IO_PENDING) {
     // Since this method is always called asynchronously. it is OK to call
@@ -266,11 +273,11 @@ int ProxyResolvingClientSocket::ReconsiderProxyAfterError(int error) {
 
   if (proxy_info_.is_https() && ssl_config_.send_client_cert) {
     network_session_->ssl_client_auth_cache()->Remove(
-        proxy_info_.proxy_server().host_port_pair().ToString());
+        proxy_info_.proxy_server().host_port_pair());
   }
 
   int rv = network_session_->proxy_service()->ReconsiderProxyAfterError(
-      proxy_url_, &proxy_info_, proxy_resolve_callback_, &pac_request_,
+      proxy_url_, error, &proxy_info_, proxy_resolve_callback_, &pac_request_,
       bound_net_log_);
   if (rv == net::OK || rv == net::ERR_IO_PENDING) {
     CloseTransportSocket();
diff --git a/chromium/jingle/glue/proxy_resolving_client_socket.h b/chromium/jingle/glue/proxy_resolving_client_socket.h
index 99824d09e59..58bbdba4d26 100644
--- a/chromium/jingle/glue/proxy_resolving_client_socket.h
+++ b/chromium/jingle/glue/proxy_resolving_client_socket.h
@@ -52,8 +52,8 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
                    const net::CompletionCallback& callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     const net::CompletionCallback& callback) OVERRIDE;
-  virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual bool SetSendBufferSize(int32 size) OVERRIDE;
+  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
+  virtual int SetSendBufferSize(int32 size) OVERRIDE;
   virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
diff --git a/chromium/jingle/glue/pseudotcp_adapter.cc b/chromium/jingle/glue/pseudotcp_adapter.cc
index afd6c36909a..cdb44a050e6 100644
--- a/chromium/jingle/glue/pseudotcp_adapter.cc
+++ b/chromium/jingle/glue/pseudotcp_adapter.cc
@@ -484,18 +484,18 @@ int PseudoTcpAdapter::Write(net::IOBuffer* buffer, int buffer_size,
   return core_->Write(buffer, buffer_size, callback);
 }
 
-bool PseudoTcpAdapter::SetReceiveBufferSize(int32 size) {
+int PseudoTcpAdapter::SetReceiveBufferSize(int32 size) {
   DCHECK(CalledOnValidThread());
 
   core_->SetReceiveBufferSize(size);
-  return false;
+  return net::OK;
 }
 
-bool PseudoTcpAdapter::SetSendBufferSize(int32 size) {
+int PseudoTcpAdapter::SetSendBufferSize(int32 size) {
   DCHECK(CalledOnValidThread());
 
   core_->SetSendBufferSize(size);
-  return false;
+  return net::OK;
 }
 
 int PseudoTcpAdapter::Connect(const net::CompletionCallback& callback) {
diff --git a/chromium/jingle/glue/pseudotcp_adapter.h b/chromium/jingle/glue/pseudotcp_adapter.h
index 63764c4665a..e3e941965f5 100644
--- a/chromium/jingle/glue/pseudotcp_adapter.h
+++ b/chromium/jingle/glue/pseudotcp_adapter.h
@@ -34,8 +34,8 @@ class PseudoTcpAdapter : public net::StreamSocket, base::NonThreadSafe {
                    const net::CompletionCallback& callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buffer, int buffer_size,
                     const net::CompletionCallback& callback) OVERRIDE;
-  virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual bool SetSendBufferSize(int32 size) OVERRIDE;
+  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
+  virtual int SetSendBufferSize(int32 size) OVERRIDE;
 
   // net::StreamSocket implementation.
   virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
diff --git a/chromium/jingle/glue/pseudotcp_adapter_unittest.cc b/chromium/jingle/glue/pseudotcp_adapter_unittest.cc
index 7d1870ca4fa..e2329f8b345 100644
--- a/chromium/jingle/glue/pseudotcp_adapter_unittest.cc
+++ b/chromium/jingle/glue/pseudotcp_adapter_unittest.cc
@@ -142,13 +142,13 @@ class FakeSocket : public net::Socket {
     return buf_len;
   }
 
-  virtual bool SetReceiveBufferSize(int32 size) OVERRIDE {
+  virtual int SetReceiveBufferSize(int32 size) OVERRIDE {
     NOTIMPLEMENTED();
-    return false;
+    return net::ERR_NOT_IMPLEMENTED;
   }
-  virtual bool SetSendBufferSize(int32 size) OVERRIDE {
+  virtual int SetSendBufferSize(int32 size) OVERRIDE {
     NOTIMPLEMENTED();
-    return false;
+    return net::ERR_NOT_IMPLEMENTED;
   }
 
  private:
diff --git a/chromium/jingle/jingle.gyp b/chromium/jingle/jingle.gyp
index b2e9f769046..bb635a2069e 100644
--- a/chromium/jingle/jingle.gyp
+++ b/chromium/jingle/jingle.gyp
@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 {
+  'includes': [
+    'jingle.gypi',
+  ],
   'variables': {
     'chromium_code': 1,
   },  # variables
@@ -14,25 +17,7 @@
           'target_name': 'jingle_glue',
           'type': 'static_library',
           'sources': [
-            'glue/channel_socket_adapter.cc',
-            'glue/channel_socket_adapter.h',
-            'glue/chrome_async_socket.cc',
-            'glue/chrome_async_socket.h',
-            'glue/fake_ssl_client_socket.cc',
-            'glue/fake_ssl_client_socket.h',
-            'glue/proxy_resolving_client_socket.cc',
-            'glue/proxy_resolving_client_socket.h',
-            'glue/pseudotcp_adapter.cc',
-            'glue/pseudotcp_adapter.h',
-            'glue/resolving_client_socket_factory.h',
-            'glue/task_pump.cc',
-            'glue/task_pump.h',
-            'glue/thread_wrapper.cc',
-            'glue/thread_wrapper.h',
-            'glue/utils.cc',
-            'glue/utils.h',
-            'glue/xmpp_client_socket_factory.cc',
-            'glue/xmpp_client_socket_factory.h',
+            '<@(jingle_glue_sources)',
           ],
           'dependencies': [
             '../base/base.gyp:base',
@@ -114,13 +99,6 @@
           'export_dependent_settings': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
           ],
-          'conditions': [
-            ['toolkit_uses_gtk == 1', {
-              'dependencies': [
-                '../build/linux/system.gyp:gtk'
-              ],
-            }],
-          ],
         },
         {
           'target_name': 'notifier_test_util',
@@ -149,8 +127,8 @@
             'glue/fake_socket_factory.h',
           ],
           'dependencies': [
-            'jingle_glue',
             '../base/base.gyp:base',
+            'jingle_glue',
           ],
         },
         {
diff --git a/chromium/jingle/jingle.gypi b/chromium/jingle/jingle.gypi
new file mode 100644
index 00000000000..eb74bbc965e
--- /dev/null
+++ b/chromium/jingle/jingle.gypi
@@ -0,0 +1,29 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'jingle_glue_sources': [
+      'glue/channel_socket_adapter.cc',
+      'glue/channel_socket_adapter.h',
+      'glue/chrome_async_socket.cc',
+      'glue/chrome_async_socket.h',
+      'glue/fake_ssl_client_socket.cc',
+      'glue/fake_ssl_client_socket.h',
+      'glue/proxy_resolving_client_socket.cc',
+      'glue/proxy_resolving_client_socket.h',
+      'glue/pseudotcp_adapter.cc',
+      'glue/pseudotcp_adapter.h',
+      'glue/resolving_client_socket_factory.h',
+      'glue/task_pump.cc',
+      'glue/task_pump.h',
+      'glue/thread_wrapper.cc',
+      'glue/thread_wrapper.h',
+      'glue/utils.cc',
+      'glue/utils.h',
+      'glue/xmpp_client_socket_factory.cc',
+      'glue/xmpp_client_socket_factory.h',
+    ]
+  }
+}
diff --git a/chromium/jingle/jingle_nacl.gyp b/chromium/jingle/jingle_nacl.gyp
new file mode 100644
index 00000000000..d622fbed502
--- /dev/null
+++ b/chromium/jingle/jingle_nacl.gyp
@@ -0,0 +1,43 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'includes': [
+    '../native_client/build/untrusted.gypi',
+    'jingle.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'jingle_glue_nacl',
+      'type': 'none',
+      'variables': {
+        'nacl_untrusted_build': 1,
+        'nlib_target': 'libjingle_glue_nacl.a',
+        'build_glibc': 0,
+        'build_newlib': 0,
+        'build_pnacl_newlib': 1,
+      },
+      'sources': [
+        '<@(jingle_glue_sources)',
+      ],
+      'sources!': [
+        'glue/chrome_async_socket.cc',
+        'glue/proxy_resolving_client_socket.cc',
+        'glue/xmpp_client_socket_factory.cc',
+      ],
+      'dependencies': [
+        '../base/base_nacl.gyp:base_nacl',
+        '../native_client/tools.gyp:prep_toolchain',
+        '../net/net_nacl.gyp:net_nacl',
+        '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
+      ],
+      'export_dependent_settings': [
+        '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
+      ],
+    }
+  ]
+}
diff --git a/chromium/jingle/notifier/listener/notification_defines_unittest.cc b/chromium/jingle/notifier/listener/notification_defines_unittest.cc
index 389f3ccdf7a..d78323930ef 100644
--- a/chromium/jingle/notifier/listener/notification_defines_unittest.cc
+++ b/chromium/jingle/notifier/listener/notification_defines_unittest.cc
@@ -17,7 +17,7 @@ class NotificationTest : public testing::Test {};
 // Converting it to string shouldn't cause a crash.
 TEST_F(NotificationTest, BinaryData) {
   const char kNonUtf8Data[] = { '\xff', '\0' };
-  EXPECT_FALSE(IsStringUTF8(kNonUtf8Data));
+  EXPECT_FALSE(base::IsStringUTF8(kNonUtf8Data));
   Notification notification;
   notification.data = kNonUtf8Data;
   EXPECT_EQ("{ channel: \"\", data: \"\\u00FF\" }", notification.ToString());