SPDY - chunked upload - speech recognition doesn't work with SPDY/3

net/base/upload_data_stream.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_BASE_UPLOAD_DATA_STREAM_H_
 #define NET_BASE_UPLOAD_DATA_STREAM_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "net/base/net_export.h"
 #include "net/base/upload_data.h"
 
 namespace net {
 
 class FileStream;
 class IOBuffer;
+class SpdyHttpStreamSpdy2Test;
+class SpdyHttpStreamSpdy3Test;
+class SpdyNetworkTransactionSpdy2Test;
+class SpdyNetworkTransactionSpdy3Test;
 
 class NET_EXPORT UploadDataStream {
  public:
   explicit UploadDataStream(UploadData* upload_data);
   ~UploadDataStream();
 
   // Initializes the stream. This function must be called exactly once,
   // before calling any other method. It is not valid to call any method
   // (other than the destructor) if Init() returns a failure.
   //
@@ skipping 31 matching lines @@
 
   bool is_chunked() const { return upload_data_->is_chunked(); }
 
   // Returns true if all data has been consumed from this upload data
   // stream.
   bool IsEOF() const;
 
   // Returns true if the upload data in the stream is entirely in memory.
   bool IsInMemory() const;
 
-  // This method is provided only to be used by unit tests.
+ private:
+  friend class SpdyHttpStreamSpdy2Test;
+  friend class SpdyHttpStreamSpdy3Test;
+  friend class SpdyNetworkTransactionSpdy2Test;
+  friend class SpdyNetworkTransactionSpdy3Test;
+  FRIEND_TEST_ALL_PREFIXES(SpdyHttpStreamSpdy2Test, SendChunkedPost);
+  FRIEND_TEST_ALL_PREFIXES(SpdyHttpStreamSpdy2Test, DelayedSendChunkedPost);
+  FRIEND_TEST_ALL_PREFIXES(SpdyHttpStreamSpdy3Test, SendChunkedPost);
+  FRIEND_TEST_ALL_PREFIXES(SpdyHttpStreamSpdy3Test, DelayedSendChunkedPost);
+  FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test, ChunkedPost);
+  FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test, ChunkedPost);

[Ryan Sleevi, 2012/07/06 23:15:49]

Sorry, what I was suggesting was an either/or.

either:
Your base test (SpdyHttpStreamSpdy[2/3]Test, etc) could have a protected member
(SetMergeUploadChunks?) that calls UploadDataStream::set_merge_chunks. You need
only friend the base test fixtures (meaning you only need lines 73-76)

or:
You explicitly FRIEND_TEST_ALL_PREFIXES the tests that directly call
UploadDataStream::set_merge_chunks (meaning you only need lines 77-82)

You don't need both here.

If you do keep FRIEND_TEST_ALL_PREFIXES, then you also need to include
base/gtest_prod_util.h here (line 8), and you don't need the forward declares
(line 17-20/73-76)

If you keep the "friend class" (73-76) and drop the FRIEND_TEST, then you don't
need the declarations on line 17-20. A "friend class" statement acts as a
forward declaration of a type-id, within the same naming scope, if that type-id
is not yet in scope, and will act is you had done what you're explicitly doing
on 17-20.

[ramant (doing other things), 2012/07/07 04:47:05]

Done. Thanks much for your detailed comments.

+
+  // These methods are provided only to be used by unit tests.
+  static bool merge_chunks() { return merge_chunks_; }
   static void set_merge_chunks(bool merge) { merge_chunks_ = merge; }
 
- private:
   scoped_refptr<UploadData> upload_data_;
 
   // Index of the current upload element (i.e. the element currently being
   // read). The index is used as a cursor to iterate over elements in
   // |upload_data_|.
   size_t element_index_;
 
   // Size and current read position within the upload data stream.
   uint64 total_size_;
   uint64 current_position_;
 
   // True if the initialization was successful.
   bool initialized_successfully_;
 
   // TODO(satish): Remove this once we have a better way to unit test POST
   // requests with chunked uploads.
   static bool merge_chunks_;
 
   DISALLOW_COPY_AND_ASSIGN(UploadDataStream);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_UPLOAD_DATA_STREAM_H_