Revert 48186, 48196, 48198

chrome_frame/html_utils.cc

Index: chrome_frame/html_utils.cc
diff --git a/chrome_frame/html_utils.cc b/chrome_frame/html_utils.cc
index 8c8d6d35b596ed4a1e31e51477d41bbf2c4afbf7..9395afad4ce88c6113644d8bea2fe9c27f0c98c4 100644
--- a/chrome_frame/html_utils.cc
+++ b/chrome_frame/html_utils.cc
@@ -1,4 +1,4 @@
-// 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.
 //
@@ -342,13 +342,15 @@ std::string GetDefaultUserAgent() {
     } else if (SUCCEEDED(hr)) {
       // Truncate the extra allocation.
       DCHECK(size > 0);  // NOLINT
-      ret.resize(size - 1);  // NOLINT
+      ret.resize(size - sizeof(char));  // NOLINT
     }
   }
 
   if (FAILED(hr)) {
     NOTREACHED() << StringPrintf("ObtainUserAgentString==0x%08X", hr);
-    return std::string();
+    return "";
+  } else {
+    DCHECK(ret.length() == lstrlenA(ret.c_str()));
   }
 
   return ret;
@@ -360,8 +362,7 @@ bool HasFrameBustingHeader(const std::string& http_headers) {
   while (it.GetNext()) {
     if (lstrcmpiA(it.name().c_str(), kXFrameOptionsHeader) == 0) {
       std::string allow_all(kXFrameOptionsValueAllowAll);
-      if (it.values_end() - it.values_begin() !=
-          static_cast<int>(allow_all.length()) ||
+      if (it.values_end() - it.values_begin() != allow_all.length() ||
           !std::equal(it.values_begin(), it.values_end(),
               allow_all.begin(),
               CaseInsensitiveCompareASCII<const char>())) {