Update base/ to use WeakPtr<T>::get() instead of implicit "operator T*"

base/bind_internal.h.pump

 $$ This is a pump file for generating file templates.  Pump is a python
 $$ script that is part of the Google Test suite of utilities.  Description
 $$ can be found here:
 $$
 $$ http://code.google.com/p/googletest/wiki/PumpManual
 $$
 
 $$ See comment for MAX_ARITY in base/bind.h.pump.
 $var MAX_ARITY = 7
 $range ARITY 0..MAX_ARITY
@@ skipping 268 matching lines @@
 // from the invocation call.
 //
 // WeakCalls similarly need special syntax that is applied to the first
 // argument to check if they should no-op themselves.
 template <bool IsWeakCall, typename ReturnType, typename Runnable,
           typename ArgsType>
 struct InvokeHelper;
 
 $for ARITY [[
 $range ARG 1..ARITY
+$range ARG2 2..ARITY

[awong, 2013/06/03 20:13:42]

Can we call this ARG_FROM_2 or maybe even something like WEAKCALL_ARG?

 
 template <typename ReturnType, typename Runnable[[]]
 $if ARITY > 0 [[,]] $for ARG , [[typename A$(ARG)]]>
 struct InvokeHelper<false, ReturnType, Runnable,
     void($for ARG , [[A$(ARG)]])>  {
   static ReturnType MakeItSo(Runnable runnable[[]]
 $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
     return runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 };
 
 template <typename Runnable[[]]
 $if ARITY > 0 [[,]] $for ARG , [[typename A$(ARG)]]>
 struct InvokeHelper<false, void, Runnable,
     void($for ARG , [[A$(ARG)]])>  {
   static void MakeItSo(Runnable runnable[[]]
 $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
     runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
   }
 };
 
 $if ARITY > 0 [[
 
 template <typename Runnable[[]], $for ARG , [[typename A$(ARG)]]>
 struct InvokeHelper<true, void, Runnable,
     void($for ARG , [[A$(ARG)]])>  {

[awong, 2013/06/03 20:13:42]

If we're going to go with ARG2, for this invocation, can we rename

  A1 -> BoundWeakPtr
  a1 -> weak_ptr

or something similar?

   static void MakeItSo(Runnable runnable[[]]
 $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) {
     if (!a1.get()) {
       return;
     }
 
-    runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]);
+$if ARITY > 1 [[
+    runnable.Run(a1.get(), $for ARG2 , [[CallbackForward(a$(ARG2))]]);
+
+]] $else [[
+    runnable.Run(a1.get());
+
+]]
   }
 };
 
 ]]
 
 ]] $$ for ARITY
 
 #if !defined(_MSC_VER)
 
 template <typename ReturnType, typename Runnable, typename ArgsType>
@@ skipping 156 matching lines @@
 
 ]]
 };
 
 ]] $$ for ARITY
 
 }  // namespace internal
 }  // namespace base
 
 #endif  // BASE_BIND_INTERNAL_H_