Revert 48186, 48196, 48198

chrome_frame/html_utils.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/html_utils.h"
 
 #include <atlbase.h>
 #include <urlmon.h>
 
 #include "base/string_util.h"
 #include "base/string_tokenizer.h"
@@ skipping 323 matching lines @@
   std::string ret;
   DWORD size = MAX_PATH;  // NOLINT
   HRESULT hr = E_OUTOFMEMORY;
   for (int retries = 1; hr == E_OUTOFMEMORY && retries <= 10; ++retries) {
     hr = ::ObtainUserAgentString(0, WriteInto(&ret, size + 1), &size);
     if (hr == E_OUTOFMEMORY) {
       size = MAX_PATH * retries;
     } 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;
 }
 
 bool HasFrameBustingHeader(const std::string& http_headers) {
   net::HttpUtil::HeadersIterator it(
       http_headers.begin(), http_headers.end(), "\r\n");
   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>())) {
         return true;
       }
     }
   }
 
   return false;
 }
 
 }  // namespace http_utils