Revert 48186, 48196, 48198

chrome_frame/urlmon_url_request.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #include "chrome_frame/urlmon_url_request.h"
 
 #include <wininet.h>
 #include <urlmon.h>
 
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 100 matching lines @@
   }
 }
 
 bool UrlmonUrlRequest::Read(int bytes_to_read) {
   DCHECK_EQ(thread_, PlatformThread::CurrentId());
   DCHECK_GE(bytes_to_read, 0);
   DCHECK_EQ(0, calling_delegate_);
   DLOG(INFO) << __FUNCTION__ << me();
 
   // Re-entrancy check. Thou shall not call Read() while process OnReadComplete!
-  DCHECK_EQ(0u, pending_read_size_);
+  DCHECK_EQ(0, pending_read_size_);
   if (pending_read_size_ != 0)
     return false;
 
   DCHECK((status_.get_state() != Status::DONE) == (binding_ != NULL));
   if (status_.get_state() == Status::ABORTING) {
     return true;
   }
 
   // Send data if available.
   size_t bytes_copied = 0;
@@ skipping 996 matching lines @@
   --calling_delegate_;
   DLOG(INFO) << __FUNCTION__ << " done id: " << request_id;
 }
 
 void UrlmonUrlRequestManager::OnResponseEnd(int request_id,
                                             const URLRequestStatus& status) {
   DCHECK_NE(request_id, -1);
   DLOG(INFO) << __FUNCTION__;
   DCHECK(status.status() != URLRequestStatus::CANCELED);
   RequestMap::size_type n = request_map_.erase(request_id);
-  DCHECK_EQ(1u, n);
+  DCHECK_EQ(1, n);
   ++calling_delegate_;
   delegate_->OnResponseEnd(request_id, status);
   --calling_delegate_;
 }
 
 void UrlmonUrlRequestManager::OnCookiesRetrieved(bool success, const GURL& url,
     const std::string& cookie_string, int cookie_id) {
   DCHECK(url.is_valid());
   delegate_->OnCookiesRetrieved(success, url, cookie_string, cookie_id);
 }
@@ skipping 39 matching lines @@
       privacy_info_.privacy_records[UTF8ToWide(url)];
 
   privacy_entry.flags |= flags;
   privacy_entry.policy_ref = UTF8ToWide(policy_ref);
 
   if (fire_privacy_event && IsWindow(notification_window_)) {
     PostMessage(notification_window_, WM_FIRE_PRIVACY_CHANGE_NOTIFICATION, 1,
                 0);
   }
 }