diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
| commit | 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 (patch) | |
| tree | 2993e976c8470926d9e7f46a1da099c6045eecde /chrome_frame/html_utils.cc | |
| parent | b33f1d943fd420857d9c5988ce1f4598f9a8765a (diff) | |
| download | chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.zip chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.gz chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.bz2 | |
Revert "Another dependency the bbot missed!!!"
This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98.
Revert "Missed a file as part of checkin for r48186"
This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b.
Revert "Enable warning 4389 as an error on windows builds. This will make"
This reverts commit c78936bcfc65b98edf288191d927a495b0364621.
TBR=mbelshe
Review URL: http://codereview.chromium.org/2253001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/html_utils.cc')
| -rw-r--r-- | chrome_frame/html_utils.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome_frame/html_utils.cc b/chrome_frame/html_utils.cc index 8c8d6d3..9395afa 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>())) { |