summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 15:59:53 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 15:59:53 +0000
commitfe600bf48f49427004f1275a25d9366cddc522d3 (patch)
tree046d12f2699a31e9d097864c9c73e88a72527121 /chrome_frame
parentb7912e515f23f59e5386e4c9ed6e6682bdbbe555 (diff)
downloadchromium_src-fe600bf48f49427004f1275a25d9366cddc522d3.zip
chromium_src-fe600bf48f49427004f1275a25d9366cddc522d3.tar.gz
chromium_src-fe600bf48f49427004f1275a25d9366cddc522d3.tar.bz2
Fix flakiness in Chrome Frame HeaderTest.
Responses were being cached by IE, so there was a reasonable probability that two permutations used the same URL. This change adds a no-cache header so the URL doesn't matter. BUG=99235 TEST=none -- covered by chrome_frame_tests.exe Review URL: https://chromiumcodereview.appspot.com/9323031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/header_test.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/test/header_test.cc b/chrome_frame/test/header_test.cc
index 49c667d..0e61c84 100644
--- a/chrome_frame/test/header_test.cc
+++ b/chrome_frame/test/header_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -39,7 +39,8 @@ class TestData {
std::ostringstream headers;
headers << "HTTP/1.1 200 OK\r\n"
<< "Connection: close\r\n"
- << "Content-Type: text/html\r\n";
+ << "Content-Type: text/html\r\n"
+ << "Cache-Control: no-cache\r\n";
if (in_header_) {
headers << "X-UA-COMPATIBLE: " << value_ << "\r\n";
}