Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/browser/cancelable_request.h

 // Copyright (c) 2006-2008 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.
 
 // CancelableRequestProviders and Consumers work together to make requests that
 // execute on a background thread in the provider and return data to the
 // consumer. These class collaborate to keep a list of open requests and to
 // make sure that requests to not outlive either of the objects involved in the
 // transaction.
 //
@@ skipping 219 matching lines @@
   }
 
   // Returns the number of pending requests.
   size_t PendingRequestCount() const {
     return pending_requests_.size();
   }
 
   // Cancels all requests outstanding.
   void CancelAllRequests() {
     PendingRequestList copied_requests(pending_requests_);
-    for (PendingRequestList::iterator i = copied_requests.begin();
+    for (typename PendingRequestList::iterator i = copied_requests.begin();
          i != copied_requests.end(); ++i)
       i->first.provider->CancelRequest(i->first.handle);
     copied_requests.clear();
 
     // That should have cleared all the pending items.
     DCHECK(pending_requests_.empty());
   }
 
   // Gets the client data for all pending requests.
   void GetAllClientData(std::vector<T>* data) {
     DCHECK(data);
-    for (PendingRequestList::iterator i = pending_requests_.begin();
+    for (typename PendingRequestList::iterator i = pending_requests_.begin();
          i != pending_requests_.end(); ++i)
       data->push_back(i->second);
   }
 
  protected:
   struct PendingRequest {
     PendingRequest(CancelableRequestProvider* p,
                    CancelableRequestProvider::Handle h)
         : provider(p), handle(h) {
     }
@@ skipping 12 matching lines @@
 
   virtual void OnRequestAdded(CancelableRequestProvider* provider,
                               CancelableRequestProvider::Handle handle) {
     DCHECK(pending_requests_.find(PendingRequest(provider, handle)) ==
            pending_requests_.end());
     pending_requests_[PendingRequest(provider, handle)] = initial_t;
   }
 
   virtual void OnRequestRemoved(CancelableRequestProvider* provider,
                                 CancelableRequestProvider::Handle handle) {
-    PendingRequestList::iterator i =
+    typename PendingRequestList::iterator i =
         pending_requests_.find(PendingRequest(provider, handle));
     if (i == pending_requests_.end()) {
       NOTREACHED() << "Got a complete notification for a nonexistant request";
       return;
     }
 
     pending_requests_.erase(i);
   }
 
   // Lists all outstanding requests.
@@ skipping 214 matching lines @@
 //    typedef CancelableRequest1<FooCallback, std::vector<Foo>> FooRequest;
 // 3. The provider method should then fillin the contents of the vector,
 //    forwarding the result like so:
 //    request->ForwardResult(FooRequest::TupleType(request->handle(),
 //                                                 &request->value));
 //
 // Tip: for passing more than one value, use a Tuple for the value.
 template<typename CB, typename Type>
 class CancelableRequest1 : public CancelableRequest<CB> {
  public:
-  explicit CancelableRequest1(CallbackType* callback)
-      : CancelableRequest(callback) {
+  explicit CancelableRequest1(
+      typename CancelableRequest<CB>::CallbackType* callback)
+      : CancelableRequest<CB>(callback) {
   }
 
   virtual ~CancelableRequest1() {
   }
 
   // The value.
   Type value;
 };
 
 #endif  // CHROME_BROWSER_CANCELABLE_REQUEST_H__