Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

tools/android/forwarder2/self_deleter_helper.h

 // Copyright 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.
 
 #ifndef TOOLS_ANDROID_FORWARDER2_SELF_DELETER_HELPER_H_
 #define TOOLS_ANDROID_FORWARDER2_SELF_DELETER_HELPER_H_
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
 
 namespace base {
 
 class SingleThreadTaskRunner;
 
 }  // namespace base
 
 namespace forwarder2 {
 
 // Helper template class to be used in the following case:
@@ skipping 65 matching lines @@
 //   scoped_ptr<Object> object_;
 // };
 //
 template <typename T>
 class SelfDeleterHelper {
  public:
   typedef base::Callback<void (scoped_ptr<T>)> DeletionCallback;
 
   SelfDeleterHelper(T* self_deleting_object,
                     const DeletionCallback& deletion_callback)
-      : construction_runner_(base::MessageLoopProxy::current()),
+      : construction_runner_(base::MessageLoop::current()->task_runner()),
         self_deleting_object_(self_deleting_object),
         deletion_callback_(deletion_callback),
-        weak_ptr_factory_(this) {
-  }
+        weak_ptr_factory_(this) {}
 
   ~SelfDeleterHelper() {
     DCHECK(construction_runner_->RunsTasksOnCurrentThread());
   }
 
   void MaybeSelfDeleteSoon() {
     DCHECK(!construction_runner_->RunsTasksOnCurrentThread());
     construction_runner_->PostTask(
         FROM_HERE,
         base::Bind(&SelfDeleterHelper::SelfDelete,
@@ skipping 15 matching lines @@
   // that any WeakPtrs to Controller are invalidated before its members
   // variable's destructors are executed, rendering them invalid.
   base::WeakPtrFactory<SelfDeleterHelper<T> > weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SelfDeleterHelper);
 };
 
 }  // namespace forwarder2
 
 #endif  // TOOLS_ANDROID_FORWARDER2_SELF_DELETER_HELPER_H_