Revert "Fix a ton of compiler warnings."

chrome/browser/cancelable_request.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 //
 // If you do not need to return data to the consumer, do not use this system,
@@ skipping 61 matching lines @@
 //       // Depending on your typedefs, one of these two forms will be more
 //       // convenient:
 //       request->ForwardResult(Tuple1<int>(return_value));
 //
 //       // -- or --  (inferior in this case)
 //       request->ForwardResult(Frontend::RequestCallbackType::TupleType(
 //           return_value));
 //     }
 //   };
 
-#ifndef CHROME_BROWSER_CANCELABLE_REQUEST_H_
-#define CHROME_BROWSER_CANCELABLE_REQUEST_H_
+#ifndef CHROME_BROWSER_CANCELABLE_REQUEST_H__
+#define CHROME_BROWSER_CANCELABLE_REQUEST_H__
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
@@ skipping 172 matching lines @@
         return provider < other.provider;
       return handle < other.handle;
     }
 
     CancelableRequestProvider* provider;
     CancelableRequestProvider::Handle handle;
   };
   typedef std::map<PendingRequest, T> PendingRequestList;
 
   virtual T get_initial_t() const {
-    return 0;
+    return NULL;
   }
 
   virtual void OnRequestAdded(CancelableRequestProvider* provider,
                               CancelableRequestProvider::Handle handle) {
     DCHECK(pending_requests_.find(PendingRequest(provider, handle)) ==
            pending_requests_.end());
     pending_requests_[PendingRequest(provider, handle)] = get_initial_t();
   }
 
   virtual void OnRequestRemoved(CancelableRequestProvider* provider,
@@ skipping 248 matching lines @@
       : CancelableRequest<CB>(callback) {
   }
 
   virtual ~CancelableRequest1() {
   }
 
   // The value.
   Type value;
 };
 
-#endif  // CHROME_BROWSER_CANCELABLE_REQUEST_H_
+#endif  // CHROME_BROWSER_CANCELABLE_REQUEST_H__