Revert of Add a dummy variable to ResourceMsg_DataReceived.

content/child/threaded_data_provider.cc

 // 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.
 
 #include "content/child/threaded_data_provider.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h"
 #include "content/child/child_process.h"
@@ skipping 20 matching lines @@
       const base::WeakPtr<ThreadedDataProvider>& main_thread_resource_provider,
       int request_id);
 
   // IPC::ChannelProxy::MessageFilter
   void OnFilterAdded(IPC::Sender* sender) final;
   bool OnMessageReceived(const IPC::Message& message) final;
 
  private:
   ~DataProviderMessageFilter() override {}
 
-  // TODO(erikchen): This dummy variable is temporary and is only intended to be
-  // present for one Canary release. http://crbug.com/527588.
-  void OnReceivedData(int request_id,
-                      int /* dummy variable */,
-                      int data_offset,
-                      int data_length,
+  void OnReceivedData(int request_id, int data_offset, int data_length,
                       int encoded_data_length);
 
   const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   const scheduler::WebThreadImplForWorkerScheduler& background_thread_;
   // This weakptr can only be dereferenced on the background thread.
   base::WeakPtr<ThreadedDataProvider>
       background_thread_resource_provider_;
   // This weakptr can only be dereferenced on the main thread.
   base::WeakPtr<ThreadedDataProvider>
@@ skipping 41 matching lines @@
 
   base::PickleIterator iter(message);
   if (!iter.ReadInt(&request_id)) {
     NOTREACHED() << "malformed resource message";
     return true;
   }
 
   if (request_id == request_id_) {
     ResourceMsg_DataReceived::Schema::Param arg;
     if (ResourceMsg_DataReceived::Read(&message, &arg)) {
-      OnReceivedData(base::get<0>(arg), base::get<1>(arg), base::get<2>(arg),
-                     base::get<3>(arg), base::get<4>(arg));
+      OnReceivedData(base::get<0>(arg), base::get<1>(arg),
+                     base::get<2>(arg), base::get<3>(arg));
       return true;
     }
   }
 
   return false;
 }
 
 void DataProviderMessageFilter::OnReceivedData(int request_id,
-                                               int /* dummy variable */,
                                                int data_offset,
                                                int data_length,
                                                int encoded_data_length) {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
   background_thread_.TaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ThreadedDataProvider::OnReceivedDataOnBackgroundThread,
                  background_thread_resource_provider_, data_offset, data_length,
                  encoded_data_length));
 }
@@ skipping 218 matching lines @@
     DCHECK(threaded_data_receiver_->needsMainthreadDataCopy());
     DCHECK_EQ((size_t)data_length, data_copy->size());
   }
 
   threaded_data_receiver_->acceptMainthreadDataNotification(
       (data_copy && !data_copy->empty()) ? &data_copy->front() : NULL,
       data_length, encoded_data_length);
 }
 
 }  // namespace content