Refactoring the weak_ptr_factory order in src/content/child

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 "content/child/child_process.h"
 #include "content/child/child_thread.h"
 #include "content/child/resource_dispatcher.h"
 #include "content/child/thread_safe_sender.h"
@@ skipping 106 matching lines @@
 }
 
 }  // anonymous namespace
 
 ThreadedDataProvider::ThreadedDataProvider(
     int request_id, blink::WebThreadedDataReceiver* threaded_data_receiver,
     linked_ptr<base::SharedMemory> shm_buffer, int shm_size)
     : request_id_(request_id),
       shm_buffer_(shm_buffer),
       shm_size_(shm_size),
-      main_thread_weak_factory_(this),
       background_thread_(
           static_cast<WebThreadImpl&>(
               *threaded_data_receiver->backgroundThread())),
       ipc_channel_(ChildThread::current()->channel()),
       threaded_data_receiver_(threaded_data_receiver),
       resource_filter_active_(false),
-      main_thread_message_loop_(ChildThread::current()->message_loop()) {
+      main_thread_message_loop_(ChildThread::current()->message_loop()),
+      main_thread_weak_factory_(this) {
   DCHECK(ChildThread::current());
   DCHECK(ipc_channel_);
   DCHECK(threaded_data_receiver_);
   DCHECK(main_thread_message_loop_);
 
   background_thread_weak_factory_.reset(
       new base::WeakPtrFactory<ThreadedDataProvider>(this));
 
   filter_ = new DataProviderMessageFilter(
       ChildProcess::current()->io_message_loop_proxy(),
@@ skipping 135 matching lines @@
 
   // TODO(oysteine): SiteIsolationPolicy needs to be be checked
   // here before we pass the data to the data provider
   // (or earlier on the I/O thread), otherwise once SiteIsolationPolicy does
   // actual blocking as opposed to just UMA logging this will bypass it.
   threaded_data_receiver_->acceptData(data, data_length);
   ipc_channel_->Send(new ResourceHostMsg_DataReceived_ACK(request_id_));
 }
 
 }  // namespace content