Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

17 files changed, 81 insertions, 60 deletions

diff --git a/chromium/jingle/glue/channel_socket_adapter.cc b/chromium/jingle/glue/channel_socket_adapter.cc
index 0f68d502c73..27f0080213f 100644
--- a/chromium/jingle/glue/channel_socket_adapter.cc
+++ b/chromium/jingle/glue/channel_socket_adapter.cc
@@ -77,7 +77,8 @@ int TransportChannelSocketAdapter::Write(
 
   int result;
   if (channel_->writable()) {
-    result = channel_->SendPacket(buffer->data(), buffer_size);
+    result = channel_->SendPacket(buffer->data(), buffer_size,
+                                  talk_base::DSCP_NO_CHANGE);
     if (result < 0) {
       result = net::MapSystemError(channel_->GetError());
 
@@ -171,7 +172,8 @@ void TransportChannelSocketAdapter::OnWritableState(
   // Try to send the packet if there is a pending write.
   if (!write_callback_.is_null()) {
     int result = channel_->SendPacket(write_buffer_->data(),
-                                      write_buffer_size_);
+                                      write_buffer_size_,
+                                      talk_base::DSCP_NO_CHANGE);
     if (result < 0)
       result = net::MapSystemError(channel_->GetError());
 
diff --git a/chromium/jingle/glue/channel_socket_adapter_unittest.cc b/chromium/jingle/glue/channel_socket_adapter_unittest.cc
index 65dce71695b..6a89a43ce7b 100644
--- a/chromium/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/chromium/jingle/glue/channel_socket_adapter_unittest.cc
@@ -34,10 +34,27 @@ class MockTransportChannel : public cricket::TransportChannel {
     set_readable(true);
   }
 
-  MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags));
+  MOCK_METHOD4(SendPacket, int(const char* data,
+                               size_t len,
+                               talk_base::DiffServCodePoint dscp,
+                               int flags));
   MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
   MOCK_METHOD0(GetError, int());
   MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole());
+  MOCK_METHOD1(GetStats, bool(cricket::ConnectionInfos* infos));
+  MOCK_CONST_METHOD0(IsDtlsActive, bool());
+  MOCK_CONST_METHOD1(GetSslRole, bool(talk_base::SSLRole* role));
+  MOCK_METHOD1(SetSrtpCiphers, bool(const std::vector<std::string>& ciphers));
+  MOCK_METHOD1(GetSrtpCipher, bool(std::string* cipher));
+  MOCK_CONST_METHOD1(GetLocalIdentity, bool(talk_base::SSLIdentity** identity));
+  MOCK_CONST_METHOD1(GetRemoteCertificate,
+                     bool(talk_base::SSLCertificate** cert));
+  MOCK_METHOD6(ExportKeyingMaterial, bool(const std::string& label,
+                                          const uint8* context,
+                                          size_t context_len,
+                                          bool use_context,
+                                          uint8* result,
+                                          size_t result_len));
 };
 
 class TransportChannelSocketAdapterTest : public testing::Test {
@@ -93,7 +110,8 @@ TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
 TEST_F(TransportChannelSocketAdapterTest, Write) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
+                                   talk_base::DSCP_NO_CHANGE, 0))
       .WillOnce(Return(kTestDataSize));
 
   int result = target_->Write(buffer.get(), kTestDataSize, callback_);
@@ -105,7 +123,8 @@ TEST_F(TransportChannelSocketAdapterTest, Write) {
 TEST_F(TransportChannelSocketAdapterTest, WritePending) {
   scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
 
-  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, 0))
+  EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
+                                   talk_base::DSCP_NO_CHANGE, 0))
       .Times(1)
       .WillOnce(Return(SOCKET_ERROR));
 
diff --git a/chromium/jingle/glue/chrome_async_socket.cc b/chromium/jingle/glue/chrome_async_socket.cc
index 39085e105f6..c14fb99b11e 100644
--- a/chromium/jingle/glue/chrome_async_socket.cc
+++ b/chromium/jingle/glue/chrome_async_socket.cc
@@ -106,9 +106,9 @@ bool ChromeAsyncSocket::Connect(const talk_base::SocketAddress& address) {
 
   net::HostPortPair dest_host_port_pair(address.hostname(), address.port());
 
-  transport_socket_.reset(
+  transport_socket_ =
       resolving_client_socket_factory_->CreateTransportClientSocket(
-          dest_host_port_pair));
+          dest_host_port_pair);
   int status = transport_socket_->Connect(
       base::Bind(&ChromeAsyncSocket::ProcessConnectDone,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -404,10 +404,10 @@ bool ChromeAsyncSocket::StartTls(const std::string& domain_name) {
   DCHECK(transport_socket_.get());
   scoped_ptr<net::ClientSocketHandle> socket_handle(
       new net::ClientSocketHandle());
-  socket_handle->set_socket(transport_socket_.release());
-  transport_socket_.reset(
+  socket_handle->SetSocket(transport_socket_.Pass());
+  transport_socket_ =
       resolving_client_socket_factory_->CreateSSLClientSocket(
-          socket_handle.release(), net::HostPortPair(domain_name, 443)));
+          socket_handle.Pass(), net::HostPortPair(domain_name, 443));
   int status = transport_socket_->Connect(
       base::Bind(&ChromeAsyncSocket::ProcessSSLConnectDone,
                  weak_ptr_factory_.GetWeakPtr()));
diff --git a/chromium/jingle/glue/chrome_async_socket_unittest.cc b/chromium/jingle/glue/chrome_async_socket_unittest.cc
index ebb69a21aa6..db3d2b09c9f 100644
--- a/chromium/jingle/glue/chrome_async_socket_unittest.cc
+++ b/chromium/jingle/glue/chrome_async_socket_unittest.cc
@@ -113,20 +113,20 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
   }
 
   // ResolvingClientSocketFactory implementation.
-  virtual net::StreamSocket* CreateTransportClientSocket(
+  virtual scoped_ptr<net::StreamSocket> CreateTransportClientSocket(
       const net::HostPortPair& host_and_port) OVERRIDE {
     return mock_client_socket_factory_->CreateTransportClientSocket(
         address_list_, NULL, net::NetLog::Source());
   }
 
-  virtual net::SSLClientSocket* CreateSSLClientSocket(
-      net::ClientSocketHandle* transport_socket,
+  virtual scoped_ptr<net::SSLClientSocket> CreateSSLClientSocket(
+      scoped_ptr<net::ClientSocketHandle> transport_socket,
       const net::HostPortPair& host_and_port) OVERRIDE {
     net::SSLClientSocketContext context;
     context.cert_verifier = cert_verifier_.get();
     context.transport_security_state = transport_security_state_.get();
     return mock_client_socket_factory_->CreateSSLClientSocket(
-        transport_socket, host_and_port, ssl_config_, context);
+        transport_socket.Pass(), host_and_port, ssl_config_, context);
   }
 
  private:
diff --git a/chromium/jingle/glue/fake_socket_factory.cc b/chromium/jingle/glue/fake_socket_factory.cc
index c5465a6f02a..823367f6340 100644
--- a/chromium/jingle/glue/fake_socket_factory.cc
+++ b/chromium/jingle/glue/fake_socket_factory.cc
@@ -33,13 +33,15 @@ talk_base::SocketAddress FakeUDPPacketSocket::GetRemoteAddress() const {
   return remote_address_;
 }
 
-int FakeUDPPacketSocket::Send(const void *data, size_t data_size) {
+int FakeUDPPacketSocket::Send(const void *data, size_t data_size,
+                              talk_base::DiffServCodePoint dscp) {
   DCHECK(CalledOnValidThread());
-  return SendTo(data, data_size, remote_address_);
+  return SendTo(data, data_size, remote_address_, dscp);
 }
 
 int FakeUDPPacketSocket::SendTo(const void *data, size_t data_size,
-                                const talk_base::SocketAddress& address) {
+                                const talk_base::SocketAddress& address,
+                                talk_base::DiffServCodePoint dscp) {
   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 cb56a3c7818..e9af78de3fa 100644
--- a/chromium/jingle/glue/fake_socket_factory.h
+++ b/chromium/jingle/glue/fake_socket_factory.h
@@ -38,9 +38,11 @@ class FakeUDPPacketSocket : public talk_base::AsyncPacketSocket,
   // talk_base::AsyncPacketSocket implementation.
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
-  virtual int Send(const void *pv, size_t cb) OVERRIDE;
+  virtual int Send(const void *pv, size_t cb,
+                   talk_base::DiffServCodePoint dscp) OVERRIDE;
   virtual int SendTo(const void *pv, size_t cb,
-                     const talk_base::SocketAddress& addr) OVERRIDE;
+                     const talk_base::SocketAddress& addr,
+                     talk_base::DiffServCodePoint dscp) 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 bf6d12a7dcc..9d722c7861b 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket.cc
+++ b/chromium/jingle/glue/fake_ssl_client_socket.cc
@@ -77,8 +77,8 @@ base::StringPiece FakeSSLClientSocket::GetSslServerHello() {
 }
 
 FakeSSLClientSocket::FakeSSLClientSocket(
-    net::StreamSocket* transport_socket)
-    : transport_socket_(transport_socket),
+    scoped_ptr<net::StreamSocket> transport_socket)
+    : transport_socket_(transport_socket.Pass()),
       next_handshake_state_(STATE_NONE),
       handshake_completed_(false),
       write_buf_(NewDrainableIOBufferWithSize(arraysize(kSslClientHello))),
diff --git a/chromium/jingle/glue/fake_ssl_client_socket.h b/chromium/jingle/glue/fake_ssl_client_socket.h
index 5bc4547d62b..54a9e2f2b1b 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket.h
+++ b/chromium/jingle/glue/fake_ssl_client_socket.h
@@ -36,8 +36,7 @@ namespace jingle_glue {
 
 class FakeSSLClientSocket : public net::StreamSocket {
  public:
-  // Takes ownership of |transport_socket|.
-  explicit FakeSSLClientSocket(net::StreamSocket* transport_socket);
+  explicit FakeSSLClientSocket(scoped_ptr<net::StreamSocket> transport_socket);
 
   virtual ~FakeSSLClientSocket();
 
diff --git a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
index 5c061f3774c..f6d8fea5fb3 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
+++ b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -91,7 +91,7 @@ class FakeSSLClientSocketTest : public testing::Test {
 
   virtual ~FakeSSLClientSocketTest() {}
 
-  net::StreamSocket* MakeClientSocket() {
+  scoped_ptr<net::StreamSocket> MakeClientSocket() {
     return mock_client_socket_factory_.CreateTransportClientSocket(
         net::AddressList(), NULL, net::NetLog::Source());
   }
@@ -269,7 +269,7 @@ class FakeSSLClientSocketTest : public testing::Test {
 };
 
 TEST_F(FakeSSLClientSocketTest, PassThroughMethods) {
-  MockClientSocket* mock_client_socket = new MockClientSocket();
+  scoped_ptr<MockClientSocket> mock_client_socket(new MockClientSocket());
   const int kReceiveBufferSize = 10;
   const int kSendBufferSize = 20;
   net::IPEndPoint ip_endpoint(net::IPAddressNumber(net::kIPv4AddressSize), 80);
@@ -284,7 +284,8 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) {
   EXPECT_CALL(*mock_client_socket, SetOmniboxSpeculation());
 
   // Takes ownership of |mock_client_socket|.
-  FakeSSLClientSocket fake_ssl_client_socket(mock_client_socket);
+  FakeSSLClientSocket fake_ssl_client_socket(
+      mock_client_socket.PassAs<net::StreamSocket>());
   fake_ssl_client_socket.SetReceiveBufferSize(kReceiveBufferSize);
   fake_ssl_client_socket.SetSendBufferSize(kSendBufferSize);
   EXPECT_EQ(kPeerAddress,
diff --git a/chromium/jingle/glue/logging_unittest.cc b/chromium/jingle/glue/logging_unittest.cc
index 85ac558ca3c..ba1f8594862 100644
--- a/chromium/jingle/glue/logging_unittest.cc
+++ b/chromium/jingle/glue/logging_unittest.cc
@@ -84,7 +84,7 @@ TEST(LibjingleLogTest, DefaultConfiguration) {
   // Read file to string.
   base::FilePath file_path(log_file_name);
   std::string contents_of_file;
-  file_util::ReadFileToString(file_path, &contents_of_file);
+  base::ReadFileToString(file_path, &contents_of_file);
 
   // Make sure string contains the expected values.
   EXPECT_FALSE(ContainsString(contents_of_file, AsString(talk_base::LS_ERROR)));
@@ -111,7 +111,7 @@ TEST(LibjingleLogTest, InfoConfiguration) {
   // Read file to string.
   base::FilePath file_path(log_file_name);
   std::string contents_of_file;
-  file_util::ReadFileToString(file_path, &contents_of_file);
+  base::ReadFileToString(file_path, &contents_of_file);
 
   // Make sure string contains the expected values.
   EXPECT_TRUE(ContainsString(contents_of_file, AsString(talk_base::LS_ERROR)));
@@ -145,7 +145,7 @@ TEST(LibjingleLogTest, LogEverythingConfiguration) {
   // Read file to string.
   base::FilePath file_path(log_file_name);
   std::string contents_of_file;
-  file_util::ReadFileToString(file_path, &contents_of_file);
+  base::ReadFileToString(file_path, &contents_of_file);
 
   // Make sure string contains the expected values.
   EXPECT_TRUE(ContainsString(contents_of_file, AsString(talk_base::LS_ERROR)));
diff --git a/chromium/jingle/glue/resolving_client_socket_factory.h b/chromium/jingle/glue/resolving_client_socket_factory.h
index 5be8bc88c2d..d1b9fc1f389 100644
--- a/chromium/jingle/glue/resolving_client_socket_factory.h
+++ b/chromium/jingle/glue/resolving_client_socket_factory.h
@@ -5,6 +5,7 @@
 #ifndef JINGLE_GLUE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
 #define JINGLE_GLUE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
 
+#include "base/memory/scoped_ptr.h"
 
 namespace net {
 class ClientSocketHandle;
@@ -23,11 +24,11 @@ class ResolvingClientSocketFactory {
  public:
   virtual ~ResolvingClientSocketFactory() { }
   // Method to create a transport socket using a HostPortPair.
-  virtual net::StreamSocket* CreateTransportClientSocket(
+  virtual scoped_ptr<net::StreamSocket> CreateTransportClientSocket(
       const net::HostPortPair& host_and_port) = 0;
 
-  virtual net::SSLClientSocket* CreateSSLClientSocket(
-      net::ClientSocketHandle* transport_socket,
+  virtual scoped_ptr<net::SSLClientSocket> CreateSSLClientSocket(
+      scoped_ptr<net::ClientSocketHandle> transport_socket,
       const net::HostPortPair& host_and_port) = 0;
 };
 
diff --git a/chromium/jingle/glue/thread_wrapper.cc b/chromium/jingle/glue/thread_wrapper.cc
index f26bc3c113f..ab5120dea0d 100644
--- a/chromium/jingle/glue/thread_wrapper.cc
+++ b/chromium/jingle/glue/thread_wrapper.cc
@@ -56,7 +56,7 @@ JingleThreadWrapper::JingleThreadWrapper(
       weak_ptr_(weak_ptr_factory_.GetWeakPtr()) {
   DCHECK(task_runner->BelongsToCurrentThread());
   DCHECK(!talk_base::Thread::Current());
-  talk_base::MessageQueueManager::Instance()->Add(this);
+  talk_base::MessageQueueManager::Add(this);
   WrapCurrent();
 }
 
@@ -69,7 +69,7 @@ void JingleThreadWrapper::WillDestroyCurrentMessageLoop() {
   UnwrapCurrent();
   g_jingle_thread_wrapper.Get().Set(NULL);
   talk_base::ThreadManager::Instance()->SetCurrentThread(NULL);
-  talk_base::MessageQueueManager::Instance()->Remove(this);
+  talk_base::MessageQueueManager::Remove(this);
   talk_base::SocketServer* ss = socketserver();
   delete this;
   delete ss;
diff --git a/chromium/jingle/glue/xmpp_client_socket_factory.cc b/chromium/jingle/glue/xmpp_client_socket_factory.cc
index b9e040d619f..4823ee5d9bd 100644
--- a/chromium/jingle/glue/xmpp_client_socket_factory.cc
+++ b/chromium/jingle/glue/xmpp_client_socket_factory.cc
@@ -8,6 +8,7 @@
 #include "jingle/glue/fake_ssl_client_socket.h"
 #include "jingle/glue/proxy_resolving_client_socket.h"
 #include "net/socket/client_socket_factory.h"
+#include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -28,20 +29,25 @@ XmppClientSocketFactory::XmppClientSocketFactory(
 
 XmppClientSocketFactory::~XmppClientSocketFactory() {}
 
-net::StreamSocket* XmppClientSocketFactory::CreateTransportClientSocket(
+scoped_ptr<net::StreamSocket>
+XmppClientSocketFactory::CreateTransportClientSocket(
     const net::HostPortPair& host_and_port) {
   // TODO(akalin): Use socket pools.
-  net::StreamSocket* transport_socket = new ProxyResolvingClientSocket(
-      NULL,
-      request_context_getter_,
-      ssl_config_,
-      host_and_port);
+  scoped_ptr<net::StreamSocket> transport_socket(
+      new ProxyResolvingClientSocket(
+          NULL,
+          request_context_getter_,
+          ssl_config_,
+          host_and_port));
   return (use_fake_ssl_client_socket_ ?
-          new FakeSSLClientSocket(transport_socket) : transport_socket);
+          scoped_ptr<net::StreamSocket>(
+              new FakeSSLClientSocket(transport_socket.Pass())) :
+          transport_socket.Pass());
 }
 
-net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
-    net::ClientSocketHandle* transport_socket,
+scoped_ptr<net::SSLClientSocket>
+XmppClientSocketFactory::CreateSSLClientSocket(
+    scoped_ptr<net::ClientSocketHandle> transport_socket,
     const net::HostPortPair& host_and_port) {
   net::SSLClientSocketContext context;
   context.cert_verifier =
@@ -52,7 +58,7 @@ net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
   // TODO(rkn): context.server_bound_cert_service is NULL because the
   // ServerBoundCertService class is not thread safe.
   return client_socket_factory_->CreateSSLClientSocket(
-      transport_socket, host_and_port, ssl_config_, context);
+      transport_socket.Pass(), host_and_port, ssl_config_, context);
 }
 
 
diff --git a/chromium/jingle/glue/xmpp_client_socket_factory.h b/chromium/jingle/glue/xmpp_client_socket_factory.h
index c2a0d6a5187..4204c1982e8 100644
--- a/chromium/jingle/glue/xmpp_client_socket_factory.h
+++ b/chromium/jingle/glue/xmpp_client_socket_factory.h
@@ -35,11 +35,11 @@ class XmppClientSocketFactory : public ResolvingClientSocketFactory {
   virtual ~XmppClientSocketFactory();
 
   // ResolvingClientSocketFactory implementation.
-  virtual net::StreamSocket* CreateTransportClientSocket(
+  virtual scoped_ptr<net::StreamSocket> CreateTransportClientSocket(
       const net::HostPortPair& host_and_port) OVERRIDE;
 
-  virtual net::SSLClientSocket* CreateSSLClientSocket(
-      net::ClientSocketHandle* transport_socket,
+  virtual scoped_ptr<net::SSLClientSocket> CreateSSLClientSocket(
+      scoped_ptr<net::ClientSocketHandle> transport_socket,
       const net::HostPortPair& host_and_port) OVERRIDE;
 
  private:
diff --git a/chromium/jingle/jingle.gyp b/chromium/jingle/jingle.gyp
index ecfd30e2778..b2e9f769046 100644
--- a/chromium/jingle/jingle.gyp
+++ b/chromium/jingle/jingle.gyp
@@ -182,7 +182,6 @@
             'notifier/listener/send_ping_task_unittest.cc',
             'notifier/listener/xml_element_util_unittest.cc',
             'notifier/listener/xmpp_push_client_unittest.cc',
-            'run_all_unittests.cc',
           ],
           'conditions': [
             ['OS=="android"', {
@@ -203,6 +202,7 @@
             'notifier',
             'notifier_test_util',
             '../base/base.gyp:base',
+            '../base/base.gyp:run_all_unittests',
             '../base/base.gyp:test_support_base',
             '../net/net.gyp:net',
             '../net/net.gyp:net_test_support',
diff --git a/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc b/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc
index 33f9949c7bf..b069c9e4fc3 100644
--- a/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc
+++ b/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc
@@ -43,7 +43,6 @@ int PushNotificationsSubscribeTask::ProcessStart() {
   scoped_ptr<buzz::XmlElement> iq_stanza(
       MakeSubscriptionMessage(subscriptions_, GetClient()->jid(),
                               task_id()));
-  std::string stanza_str = XmlElementToString(*iq_stanza.get());
   DVLOG(1) << "Push notifications: Subscription stanza: "
           << XmlElementToString(*iq_stanza.get());
 
@@ -61,10 +60,9 @@ int PushNotificationsSubscribeTask::ProcessResponse() {
   if (stanza == NULL) {
     return STATE_BLOCKED;
   }
-  std::string stanza_str = XmlElementToString(*stanza);
   DVLOG(1) << "Push notifications: Subscription response: "
            << XmlElementToString(*stanza);
-  // We've receieved a response to our subscription request.
+  // We've received a response to our subscription request.
   if (stanza->HasAttr(buzz::QN_TYPE) &&
     stanza->Attr(buzz::QN_TYPE) == buzz::STR_RESULT) {
     if (delegate_)
diff --git a/chromium/jingle/run_all_unittests.cc b/chromium/jingle/run_all_unittests.cc
deleted file mode 100644
index 7fd6ef2e80e..00000000000
--- a/chromium/jingle/run_all_unittests.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "base/test/test_suite.h"
-
-int main(int argc, char** argv) {
-  return base::TestSuite(argc, argv).Run();
-}