Revert 48186, 48196, 48198

chrome_frame/test/html_util_unittests.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-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 <windows.h>
 #include <atlsecurity.h>
 #include <shellapi.h>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 273 matching lines @@
   // tag if we've already added it.
   for (int i = 0; i < arraysize(test_cases); ++i) {
     std::string ua(test_cases[i].expected_);
     std::string new_ua(http_utils::AddChromeFrameToUserAgentValue(ua));
     EXPECT_EQ(test_cases[i].expected_, new_ua);
   }
 }
 
 TEST_F(HtmlUtilUnittest, GetDefaultUserAgentHeaderWithCFTag) {
   std::string ua(http_utils::GetDefaultUserAgentHeaderWithCFTag());
-  EXPECT_NE(0u, ua.length());
+  EXPECT_NE(0, ua.length());
   EXPECT_NE(std::string::npos, ua.find("Mozilla"));
   EXPECT_NE(std::string::npos, ua.find(kChromeFrameUserAgent));
 }
 
 TEST_F(HtmlUtilUnittest, GetDefaultUserAgent) {
   std::string ua(http_utils::GetDefaultUserAgent());
-  EXPECT_NE(0u, ua.length());
+  EXPECT_NE(0, ua.length());
   EXPECT_NE(std::string::npos, ua.find("Mozilla"));
 }
 
 TEST_F(HtmlUtilUnittest, GetChromeFrameUserAgent) {
   const char* call1 = http_utils::GetChromeFrameUserAgent();
   const char* call2 = http_utils::GetChromeFrameUserAgent();
   // Expect static buffer since caller does no cleanup.
   EXPECT_EQ(call1, call2);
   std::string ua(call1);
   EXPECT_EQ("chromeframe/0.0.0.0", ua);
@@ skipping 49 matching lines @@
     "X-Frame-Options: SAMEORIGIN\r\n"));
   EXPECT_TRUE(http_utils::HasFrameBustingHeader(
     "X-Frame-Options: deny\r\n"
     "X-Frame-Options: ALLOWall\r\n"
     "Content-Length: 42\r\n"));
   EXPECT_TRUE(http_utils::HasFrameBustingHeader(
     "X-Frame-Options: SAMEORIGIN\r\n"
     "X-Frame-Options: ALLOWall\r\n"));
 }