Support smart pointers in base::DispatchToMethod

* Make base::DispatchToMethod to accept smart pointers as the this pointer * Remove base::internal::UnwrapTraits from //storage code BUG=554299 Review URL: https://codereview.chromium.org/1696093002 Cr-Commit-Position: refs/heads/master@{#375516}
QQ1350995917 · Feb 16, 2016 · 1ea87e3 · 1ea87e3
1 parent 26d7fdb
commit 1ea87e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/base/tuple.h b/base/tuple.h
@@ -196,15 +196,15 @@ inline Tuple<Ts&...> MakeRefTuple(Ts&... arg) {
 // Non-Static Dispatchers with no out params.
 
 template <typename ObjT, typename Method, typename... Ts, size_t... Ns>
-inline void DispatchToMethodImpl(ObjT* obj,
+inline void DispatchToMethodImpl(const ObjT& obj,
                                  Method method,
                                  const Tuple<Ts...>& arg,
                                  IndexSequence<Ns...>) {
   (obj->*method)(base::internal::UnwrapTraits<Ts>::Unwrap(get<Ns>(arg))...);
 }
 
 template <typename ObjT, typename Method, typename... Ts>
-inline void DispatchToMethod(ObjT* obj,
+inline void DispatchToMethod(const ObjT& obj,
                              Method method,
                              const Tuple<Ts...>& arg) {
   DispatchToMethodImpl(obj, method, arg, MakeIndexSequence<sizeof...(Ts)>());
@@ -232,7 +232,7 @@ template <typename ObjT,
           typename... OutTs,
           size_t... InNs,
           size_t... OutNs>
-inline void DispatchToMethodImpl(ObjT* obj,
+inline void DispatchToMethodImpl(const ObjT& obj,
                                  Method method,
                                  const Tuple<InTs...>& in,
                                  Tuple<OutTs...>* out,
@@ -243,7 +243,7 @@ inline void DispatchToMethodImpl(ObjT* obj,
 }
 
 template <typename ObjT, typename Method, typename... InTs, typename... OutTs>
-inline void DispatchToMethod(ObjT* obj,
+inline void DispatchToMethod(const ObjT& obj,
                              Method method,
                              const Tuple<InTs...>& in,
                              Tuple<OutTs...>* out) {

diff --git a/storage/browser/fileapi/task_runner_bound_observer_list.h b/storage/browser/fileapi/task_runner_bound_observer_list.h
@@ -17,7 +17,7 @@ namespace storage {
 // A wrapper for dispatching method.
 template <class T, class Method, class Params>
 void NotifyWrapper(T obj, Method m, const Params& p) {
-  base::DispatchToMethod(base::internal::UnwrapTraits<T>::Unwrap(obj), m, p);
+  base::DispatchToMethod(obj, m, p);
 }
 
 // An observer list helper to notify on a given task runner.
@@ -69,7 +69,7 @@ class TaskRunnerBoundObserverList {
     for (typename ObserversListMap::const_iterator it = observers_.begin();
          it != observers_.end(); ++it) {
       if (!it->second.get() || it->second->RunsTasksOnCurrentThread()) {
-        base::DispatchToMethod(UnwrapTraits::Unwrap(it->first), method, params);
+        base::DispatchToMethod(it->first, method, params);
         continue;
       }
       it->second->PostTask(
@@ -80,8 +80,6 @@ class TaskRunnerBoundObserverList {
   }
 
  private:
-  typedef base::internal::UnwrapTraits<ObserverStoreType> UnwrapTraits;
-
   ObserversListMap observers_;
 };