BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 42 insertions, 40 deletions

diff --git a/chromium/net/http/http_transaction_test_util.h b/chromium/net/http/http_transaction_test_util.h
index f123794529b..e6e831257e8 100644
--- a/chromium/net/http/http_transaction_test_util.h
+++ b/chromium/net/http/http_transaction_test_util.h
@@ -28,6 +28,7 @@
 namespace net {
 class HttpRequestHeaders;
 class IOBuffer;
+struct HttpRequestInfo;
 }
 
 //-----------------------------------------------------------------------------
@@ -167,63 +168,63 @@ class MockNetworkTransaction
  public:
   MockNetworkTransaction(net::RequestPriority priority,
                          MockNetworkLayer* factory);
-  virtual ~MockNetworkTransaction();
+  ~MockNetworkTransaction() override;
 
-  virtual int Start(const net::HttpRequestInfo* request,
-                    const net::CompletionCallback& callback,
-                    const net::BoundNetLog& net_log) OVERRIDE;
+  int Start(const net::HttpRequestInfo* request,
+            const net::CompletionCallback& callback,
+            const net::BoundNetLog& net_log) override;
+
+  int RestartIgnoringLastError(
+      const net::CompletionCallback& callback) override;
 
-  virtual int RestartIgnoringLastError(
-      const net::CompletionCallback& callback) OVERRIDE;
+  int RestartWithCertificate(net::X509Certificate* client_cert,
+                             const net::CompletionCallback& callback) override;
 
-  virtual int RestartWithCertificate(
-      net::X509Certificate* client_cert,
-      const net::CompletionCallback& callback) OVERRIDE;
+  int RestartWithAuth(const net::AuthCredentials& credentials,
+                      const net::CompletionCallback& callback) override;
 
-  virtual int RestartWithAuth(
-      const net::AuthCredentials& credentials,
-      const net::CompletionCallback& callback) OVERRIDE;
+  bool IsReadyToRestartForAuth() override;
 
-  virtual bool IsReadyToRestartForAuth() OVERRIDE;
+  int Read(net::IOBuffer* buf,
+           int buf_len,
+           const net::CompletionCallback& callback) override;
 
-  virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) OVERRIDE;
+  void StopCaching() override;
 
-  virtual void StopCaching() OVERRIDE;
+  bool GetFullRequestHeaders(net::HttpRequestHeaders* headers) const override;
 
-  virtual bool GetFullRequestHeaders(
-      net::HttpRequestHeaders* headers) const OVERRIDE;
+  int64 GetTotalReceivedBytes() const override;
 
-  virtual int64 GetTotalReceivedBytes() const OVERRIDE;
+  void DoneReading() override;
 
-  virtual void DoneReading() OVERRIDE;
+  const net::HttpResponseInfo* GetResponseInfo() const override;
 
-  virtual const net::HttpResponseInfo* GetResponseInfo() const OVERRIDE;
+  net::LoadState GetLoadState() const override;
 
-  virtual net::LoadState GetLoadState() const OVERRIDE;
+  net::UploadProgress GetUploadProgress() const override;
 
-  virtual net::UploadProgress GetUploadProgress() const OVERRIDE;
+  void SetQuicServerInfo(net::QuicServerInfo* quic_server_info) override;
 
-  virtual void SetQuicServerInfo(
-      net::QuicServerInfo* quic_server_info) OVERRIDE;
+  bool GetLoadTimingInfo(net::LoadTimingInfo* load_timing_info) const override;
 
-  virtual bool GetLoadTimingInfo(
-      net::LoadTimingInfo* load_timing_info) const OVERRIDE;
+  void SetPriority(net::RequestPriority priority) override;
 
-  virtual void SetPriority(net::RequestPriority priority) OVERRIDE;
+  void SetWebSocketHandshakeStreamCreateHelper(
+      CreateHelper* create_helper) override;
 
-  virtual void SetWebSocketHandshakeStreamCreateHelper(
-      CreateHelper* create_helper) OVERRIDE;
+  void SetBeforeNetworkStartCallback(
+      const BeforeNetworkStartCallback& callback) override;
 
-  virtual void SetBeforeNetworkStartCallback(
-      const BeforeNetworkStartCallback& callback) OVERRIDE;
+  void SetBeforeProxyHeadersSentCallback(
+      const BeforeProxyHeadersSentCallback& callback) override;
 
-  virtual int ResumeNetworkStart() OVERRIDE;
+  int ResumeNetworkStart() override;
 
   CreateHelper* websocket_handshake_stream_create_helper() {
     return websocket_handshake_stream_create_helper_;
   }
   net::RequestPriority priority() const { return priority_; }
+  const net::HttpRequestInfo* request() const { return request_; }
 
  private:
   int StartInternal(const net::HttpRequestInfo* request,
@@ -232,7 +233,6 @@ class MockNetworkTransaction
   void CallbackLater(const net::CompletionCallback& callback, int result);
   void RunCallback(const net::CompletionCallback& callback, int result);
 
-  base::WeakPtrFactory<MockNetworkTransaction> weak_factory_;
   const net::HttpRequestInfo* request_;
   net::HttpResponseInfo response_;
   std::string data_;
@@ -247,13 +247,16 @@ class MockNetworkTransaction
   // connection. Requires Start() be passed a BoundNetLog with a real NetLog to
   // be initialized.
   unsigned int socket_log_id_;
+
+  base::WeakPtrFactory<MockNetworkTransaction> weak_factory_;
+
 };
 
 class MockNetworkLayer : public net::HttpTransactionFactory,
                          public base::SupportsWeakPtr<MockNetworkLayer> {
  public:
   MockNetworkLayer();
-  virtual ~MockNetworkLayer();
+  ~MockNetworkLayer() override;
 
   int transaction_count() const { return transaction_count_; }
   bool done_reading_called() const { return done_reading_called_; }
@@ -283,11 +286,10 @@ class MockNetworkLayer : public net::HttpTransactionFactory,
   }
 
   // net::HttpTransactionFactory:
-  virtual int CreateTransaction(
-      net::RequestPriority priority,
-      scoped_ptr<net::HttpTransaction>* trans) OVERRIDE;
-  virtual net::HttpCache* GetCache() OVERRIDE;
-  virtual net::HttpNetworkSession* GetSession() OVERRIDE;
+  int CreateTransaction(net::RequestPriority priority,
+                        scoped_ptr<net::HttpTransaction>* trans) override;
+  net::HttpCache* GetCache() override;
+  net::HttpNetworkSession* GetSession() override;
 
  private:
   int transaction_count_;