Don't share ResourceDispatcherHostImpl's timer for reporting upload progress.

content/browser/loader/resource_loader_unittest.cc

 // Copyright (c) 2013 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 "content/browser/loader/resource_loader.h"
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/loader/redirect_to_file_resource_handler.h"
 #include "content/browser/loader/resource_loader_delegate.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/resource_request_info.h"
+#include "content/public/common/content_paths.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/test/test_content_browser_client.h"
 #include "content/test/test_web_contents.h"
 #include "ipc/ipc_message.h"
+#include "net/base/elements_upload_data_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mock_file_stream.h"
 #include "net/base/net_errors.h"
 #include "net/base/request_priority.h"
+#include "net/base/upload_bytes_element_reader.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "storage/browser/blob/shareable_file_reference.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using storage::ShareableFileReference;
 
@@ skipping 126 matching lines @@
   explicit ResourceHandlerStub(net::URLRequest* request)
       : ResourceHandler(request),
         read_buffer_(new net::IOBuffer(kReadBufSize)),
         defer_request_on_will_start_(false),
         expect_reads_(true),
         cancel_on_read_completed_(false),
         defer_eof_(false),
         received_on_will_read_(false),
         received_eof_(false),
         received_response_completed_(false),
-        total_bytes_downloaded_(0) {
+        total_bytes_downloaded_(0),
+        upload_position_(0) {
   }
 
   // If true, defers the resource load in OnWillStart.
   void set_defer_request_on_will_start(bool defer_request_on_will_start) {
     defer_request_on_will_start_ = defer_request_on_will_start;
   }
 
   // If true, expect OnWillRead / OnReadCompleted pairs for handling
   // data. Otherwise, expect OnDataDownloaded.
   void set_expect_reads(bool expect_reads) { expect_reads_ = expect_reads; }
@@ skipping 11 matching lines @@
   bool received_response_completed() const {
     return received_response_completed_;
   }
   const net::URLRequestStatus& status() const { return status_; }
   int total_bytes_downloaded() const { return total_bytes_downloaded_; }
 
   void Resume() {
     controller()->Resume();
   }
 
+  // Waits until OnUploadProgress is called and returns the upload position.
+  uint64 WaitForUploadProgress() {
+    wait_for_progress_loop_.reset(new base::RunLoop());
+    wait_for_progress_loop_->Run();
+    wait_for_progress_loop_.reset();
+    return upload_position_;
+  }
+
   // ResourceHandler implementation:
   bool OnUploadProgress(uint64 position, uint64 size) override {
-    NOTREACHED();
+    upload_position_ = position;
+    if (wait_for_progress_loop_)
+      wait_for_progress_loop_->Quit();
     return true;
   }
 
   bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                            ResourceResponse* response,
                            bool* defer) override {
     NOTREACHED();
     return true;
   }
 
@@ skipping 71 matching lines @@
   bool cancel_on_read_completed_;
   bool defer_eof_;
 
   GURL start_url_;
   scoped_refptr<ResourceResponse> response_;
   bool received_on_will_read_;
   bool received_eof_;
   bool received_response_completed_;
   net::URLRequestStatus status_;
   int total_bytes_downloaded_;
+  scoped_ptr<base::RunLoop> wait_for_progress_loop_;
+  uint64 upload_position_;
 };
 
 // Test browser client that captures calls to SelectClientCertificates and
 // records the arguments of the most recent call for later inspection.
 class SelectCertificateBrowserClient : public TestContentBrowserClient {
  public:
   SelectCertificateBrowserClient() : call_count_(0) {}
 
   void SelectClientCertificate(
       WebContents* web_contents,
@@ skipping 69 matching lines @@
   virtual net::URLRequestJobFactory::ProtocolHandler* CreateProtocolHandler() {
     return net::URLRequestTestJob::CreateProtocolHandler();
   }
 
   virtual scoped_ptr<ResourceHandler> WrapResourceHandler(
       scoped_ptr<ResourceHandlerStub> leaf_handler,
       net::URLRequest* request) {
     return leaf_handler.Pass();
   }
 
-  void SetUp() override {
-    job_factory_.SetProtocolHandler("test", CreateProtocolHandler());
+  void SetUpResourceLoader(scoped_ptr<net::URLRequest> request) {

[mmenke, 2015/05/21 15:41:57]

Think this is worth a brief comment.  Just something along the lines of
"Replaces loader_ with a new one for the passed in request"

[Andre, 2015/05/21 20:59:31]

Done.

+    raw_ptr_to_request_ = request.get();
 
-    browser_context_.reset(new TestBrowserContext());
-    scoped_refptr<SiteInstance> site_instance =
-        SiteInstance::Create(browser_context_.get());
-    web_contents_.reset(
-        TestWebContents::Create(browser_context_.get(), site_instance.get()));
     RenderFrameHost* rfh = web_contents_->GetMainFrame();
-
-    scoped_ptr<net::URLRequest> request(
-        resource_context_.GetRequestContext()->CreateRequest(
-            test_url(),
-            net::DEFAULT_PRIORITY,
-            NULL /* delegate */));
-    raw_ptr_to_request_ = request.get();
     ResourceRequestInfo::AllocateForTesting(
         request.get(), RESOURCE_TYPE_MAIN_FRAME, &resource_context_,
         rfh->GetProcess()->GetID(), rfh->GetRenderViewHost()->GetRoutingID(),
         rfh->GetRoutingID(), true /* is_main_frame */,
         false /* parent_is_main_frame */, true /* allow_download */,
         false /* is_async */);
     scoped_ptr<ResourceHandlerStub> resource_handler(
         new ResourceHandlerStub(request.get()));
     raw_ptr_resource_handler_ = resource_handler.get();
     loader_.reset(new ResourceLoader(
         request.Pass(),
         WrapResourceHandler(resource_handler.Pass(), raw_ptr_to_request_),
         this));
   }
 
+  void SetUp() override {
+    job_factory_.SetProtocolHandler("test", CreateProtocolHandler());
+
+    browser_context_.reset(new TestBrowserContext());
+    scoped_refptr<SiteInstance> site_instance =
+        SiteInstance::Create(browser_context_.get());
+    web_contents_.reset(
+        TestWebContents::Create(browser_context_.get(), site_instance.get()));
+
+    scoped_ptr<net::URLRequest> request(
+        resource_context_.GetRequestContext()->CreateRequest(
+            test_url(),
+            net::DEFAULT_PRIORITY,
+            nullptr /* delegate */));
+    SetUpResourceLoader(request.Pass());
+  }
+
   void TearDown() override {
     // Destroy the WebContents and pump the event loop before destroying
     // |rvh_test_enabler_| and |thread_bundle_|. This lets asynchronous cleanup
     // tasks complete.
     web_contents_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
   // ResourceLoaderDelegate:
   ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
@@ skipping 199 matching lines @@
   EXPECT_FALSE(raw_ptr_resource_handler_->received_response_completed());
 
   raw_ptr_resource_handler_->Resume();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(raw_ptr_resource_handler_->received_response_completed());
   EXPECT_EQ(net::URLRequestStatus::SUCCESS,
             raw_ptr_resource_handler_->status().status());
 }
 
+TEST_F(ResourceLoaderTest, UploadProgress) {

[mmenke, 2015/05/21 15:41:57]

Could you add a TODO about adding a test for the redirect case?

[mmenke, 2015/05/21 15:41:57]

This test doesn't actually make sure the timer works (Which is my main concern)
- all it tests is that we get the final message when the upload is done.

That's why I was thinking we'd need to make a new class to slowly feed the data
along, and then make sure we get a couple intermediary upload progress messages.

[Andre, 2015/05/21 20:59:31]

Done. I wrapped ChunkedUploadDataStream to make it appear non-chunked.

+  // Set up a test server.
+  net::test_server::EmbeddedTestServer server;
+  ASSERT_TRUE(server.InitializeAndWaitUntilReady());
+  base::FilePath path;
+  PathService::Get(content::DIR_TEST_DATA, &path);
+  server.ServeFilesFromDirectory(path);
+
+  scoped_ptr<net::URLRequest> request(
+      resource_context_.GetRequestContext()->CreateRequest(
+          server.GetURL("/title1.html"),
+          net::DEFAULT_PRIORITY,
+          nullptr /* delegate */));
+
+  // Start an upload.
+  std::string upload_content("test");
+  scoped_ptr<net::UploadElementReader> reader(new net::UploadBytesElementReader(
+      upload_content.data(), upload_content.size()));
+  request->set_upload(
+      net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
+
+  SetUpResourceLoader(request.Pass());
+  loader_->StartRequest();
+
+  // Expect at least one upload progress, and the last one must match the upload
+  // size.
+  while (true) {
+    uint64 position = raw_ptr_resource_handler_->WaitForUploadProgress();
+    EXPECT_LE(position, upload_content.size());

[mmenke, 2015/05/21 15:41:57]

Should also check that position is monotonically increasing.

[Andre, 2015/05/21 20:59:31]

Done. Added the check inside OnUploadProgress().

+    if (position == upload_content.size())
+      break;
+  }
+}
+
 class ResourceLoaderRedirectToFileTest : public ResourceLoaderTest {
  public:
   ResourceLoaderRedirectToFileTest()
       : file_stream_(NULL),
         redirect_to_file_resource_handler_(NULL) {
   }
 
   base::FilePath temp_path() const { return temp_path_; }
   ShareableFileReference* deletable_file() const {
     return deletable_file_.get();
@@ skipping 231 matching lines @@
   ASSERT_TRUE(base::ReadFileToString(temp_path(), &contents));
   EXPECT_EQ(test_data(), contents);
 
   // Release the loader. The file should be gone now.
   ReleaseLoader();
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(base::PathExists(temp_path()));
 }
 
 }  // namespace content