Update legacy Tuple-using code.

base/observer_list_threadsafe.h

 // Copyright (c) 2012 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 BASE_OBSERVER_LIST_THREADSAFE_H_
 #define BASE_OBSERVER_LIST_THREADSAFE_H_
 
 #include <algorithm>
 #include <map>
 
@@ skipping 150 matching lines @@
     base::AutoLock lock(list_lock_);
     DCHECK(observer_lists_.empty());
   }
 
   // Notify methods.
   // Make a thread-safe callback to each Observer in the list.
   // Note, these calls are effectively asynchronous.  You cannot assume
   // that at the completion of the Notify call that all Observers have
   // been Notified.  The notification may still be pending delivery.
   template <class Method>
   void Notify(Method m) {

[Nico, 2014/12/22 17:03:12]

can possibly be a variadic template

-    UnboundMethod<ObserverType, Method, Tuple0> method(m, MakeTuple());
-    Notify<Method, Tuple0>(method);
+    UnboundMethod<ObserverType, Method, Tuple<>> method(m, MakeTuple());
+    Notify<Method, Tuple<>>(method);
   }
 
   template <class Method, class A>
   void Notify(Method m, const A& a) {
-    UnboundMethod<ObserverType, Method, Tuple1<A> > method(m, MakeTuple(a));
-    Notify<Method, Tuple1<A> >(method);
+    UnboundMethod<ObserverType, Method, Tuple<A> > method(m, MakeTuple(a));
+    Notify<Method, Tuple<A> >(method);
   }
 
   template <class Method, class A, class B>
   void Notify(Method m, const A& a, const B& b) {
-    UnboundMethod<ObserverType, Method, Tuple2<A, B> > method(
+    UnboundMethod<ObserverType, Method, Tuple<A, B> > method(
         m, MakeTuple(a, b));
-    Notify<Method, Tuple2<A, B> >(method);
+    Notify<Method, Tuple<A, B> >(method);
   }
 
   template <class Method, class A, class B, class C>
   void Notify(Method m, const A& a, const B& b, const C& c) {
-    UnboundMethod<ObserverType, Method, Tuple3<A, B, C> > method(
+    UnboundMethod<ObserverType, Method, Tuple<A, B, C> > method(
         m, MakeTuple(a, b, c));
-    Notify<Method, Tuple3<A, B, C> >(method);
+    Notify<Method, Tuple<A, B, C> >(method);
   }
 
   template <class Method, class A, class B, class C, class D>
   void Notify(Method m, const A& a, const B& b, const C& c, const D& d) {
-    UnboundMethod<ObserverType, Method, Tuple4<A, B, C, D> > method(
+    UnboundMethod<ObserverType, Method, Tuple<A, B, C, D> > method(
         m, MakeTuple(a, b, c, d));
-    Notify<Method, Tuple4<A, B, C, D> >(method);
+    Notify<Method, Tuple<A, B, C, D> >(method);
   }
 
   // TODO(mbelshe):  Add more wrappers for Notify() with more arguments.
 
  private:
   // See comment above ObserverListThreadSafeTraits' definition.
   friend struct ObserverListThreadSafeTraits<ObserverType>;
 
   struct ObserverListContext {
     explicit ObserverListContext(NotificationType type)
@@ skipping 75 matching lines @@
       ObserversListMap;
 
   mutable base::Lock list_lock_;  // Protects the observer_lists_.
   ObserversListMap observer_lists_;
   const NotificationType type_;
 
   DISALLOW_COPY_AND_ASSIGN(ObserverListThreadSafe);
 };
 
 #endif  // BASE_OBSERVER_LIST_THREADSAFE_H_