Update legacy Tuple-using code.

base/observer_list_threadsafe.h

Index: base/observer_list_threadsafe.h
diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h
index 70b4f11ffa60ca252f5a5d7b69ed047851ea41ca..ff4843e431f579a338f3af2ed3d1fde53c18c69e 100644
--- a/base/observer_list_threadsafe.h
+++ b/base/observer_list_threadsafe.h
@@ -169,35 +169,35 @@ class ObserverListThreadSafe
   // 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.