diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 20:07:35 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 20:07:35 +0000 |
| commit | 2b3102bea014c815d42aaf99a97e8da462a6ea5c (patch) | |
| tree | 9bea75fee6c9dc116e0d5e4ee3e6fad600fafcd4 /chrome_frame/test/test_with_web_server.h | |
| parent | e70313140106d364cb359179773c656c6d84423c (diff) | |
| download | chromium_src-2b3102bea014c815d42aaf99a97e8da462a6ea5c.zip chromium_src-2b3102bea014c815d42aaf99a97e8da462a6ea5c.tar.gz chromium_src-2b3102bea014c815d42aaf99a97e8da462a6ea5c.tar.bz2 | |
Only switch to cf for text/html. With opt-in URLs we could mark a URL to be loaded in CF regardless of the target mime type. If CF turns around and wants to download the target, we would hit an infinite loop.
TEST=Verify that issue 40046 is resolved. OptIn urls should work with the moniker patch and downloads should not cause an infinite loop.
BUG=40046
Review URL: http://codereview.chromium.org/1715004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.h')
| -rw-r--r-- | chrome_frame/test/test_with_web_server.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h index baba20c..f1c9334 100644 --- a/chrome_frame/test/test_with_web_server.h +++ b/chrome_frame/test/test_with_web_server.h @@ -1,8 +1,8 @@ // Copyright (c) 2006-2010 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. -#ifndef CHROME_FRAME_TEST_WITH_WEB_SERVER_H_ -#define CHROME_FRAME_TEST_WITH_WEB_SERVER_H_ +#ifndef CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ +#define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ #include <windows.h> #include <string> @@ -101,7 +101,7 @@ class ChromeFrameTestWithWebServer: public testing::Test { // SimpleWebServer class. class SimpleWebServerTest { public: - SimpleWebServerTest(int port) : server_(port), port_(port) { + explicit SimpleWebServerTest(int port) : server_(port), port_(port) { } ~SimpleWebServerTest() { @@ -159,8 +159,5 @@ class SimpleWebServerTest { int port_; }; -// TODO(tommi): Remove when this is the only option. -bool MonikerPatchEnabled(); - -#endif // CHROME_FRAME_TEST_WITH_WEB_SERVER_H_ +#endif // CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_ |