Revert 48186, 48196, 48198

chrome_frame/test/chrome_frame_test_utils.cc

 // Copyright (c) 2010 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/test/chrome_frame_test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <iepmapi.h>
 #include <sddl.h>
@@ skipping 757 matching lines @@
 HRESULT WebBrowserEventSink::SetWebBrowser(IWebBrowser2* web_browser2) {
   DCHECK(web_browser2_.get() == NULL);
   DCHECK(!is_main_browser_object_);
   web_browser2_ = web_browser2;
   web_browser2_->put_Visible(VARIANT_TRUE);
   HRESULT hr = DispEventAdvise(web_browser2_, &DIID_DWebBrowserEvents2);
   return hr;
 }
 
 HRESULT WebBrowserEventSink::CloseWebBrowser() {
-  DCHECK_EQ(process_id_to_wait_for_, 0u);
+  DCHECK_EQ(process_id_to_wait_for_, 0);
   if (!web_browser2_)
     return E_FAIL;
 
   DisconnectFromChromeFrame();
   web_browser2_->Quit();
   return S_OK;
 }
 
 void WebBrowserEventSink::ExpectRendererWindowHasFocus() {
   HWND renderer_window = GetRendererWindow();
@@ skipping 97 matching lines @@
   if (GetInstalledIEVersion() == IE_8) {
     profile_path = GetProfilePath(kIEProfileName);
   } else {
     profile_path = GetIETemporaryFilesFolder();
     profile_path = profile_path.Append(L"Google Chrome Frame");
   }
   return profile_path;
 }
 
 }  // namespace chrome_frame_test