Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: trunk/src/chrome_frame/test/net/fake_external_tab.cc

Issue 24251011: Revert 224269 "Don't persist HPKP if PrivacyMode is enabled." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_frame/test/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 #include <Winsock2.h> 10 #include <Winsock2.h>
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 // TODO(ananta): This test has been consistently failing. Disabling it for 258 // TODO(ananta): This test has been consistently failing. Disabling it for
259 // now. 259 // now.
260 "URLRequestTestHTTP.GetTest_NoCache", 260 "URLRequestTestHTTP.GetTest_NoCache",
261 261
262 // These tests use HTTPS, and IE's trust store does not have the test 262 // These tests use HTTPS, and IE's trust store does not have the test
263 // certs. So these tests time out waiting for user input. The 263 // certs. So these tests time out waiting for user input. The
264 // functionality they test (HTTP Strict Transport Security and 264 // functionality they test (HTTP Strict Transport Security and
265 // HTTP-based Public Key Pinning) does not work in Chrome Frame anyway. 265 // HTTP-based Public Key Pinning) does not work in Chrome Frame anyway.
266 "URLRequestTestHTTP.ProcessPKP", 266 "URLRequestTestHTTP.ProcessPKP",
267 "URLRequestTestHTTP.ProcessPKP_PrivacyMode",
268 "URLRequestTestHTTP.ProcessSTS", 267 "URLRequestTestHTTP.ProcessSTS",
269 "URLRequestTestHTTP.ProcessSTSOnce", 268 "URLRequestTestHTTP.ProcessSTSOnce",
270 "URLRequestTestHTTP.ProcessSTSAndPKP", 269 "URLRequestTestHTTP.ProcessSTSAndPKP",
271 "URLRequestTestHTTP.ProcessSTSAndPKP2", 270 "URLRequestTestHTTP.ProcessSTSAndPKP2",
272 271
273 // These tests have been disabled as the Chrome cookie policies don't make 272 // These tests have been disabled as the Chrome cookie policies don't make
274 // sense or have not been implemented for the host network stack. 273 // sense or have not been implemented for the host network stack.
275 "URLRequestTest.DoNotSaveCookies_ViaPolicy", 274 "URLRequestTest.DoNotSaveCookies_ViaPolicy",
276 "URLRequestTest.DoNotSendCookies_ViaPolicy", 275 "URLRequestTest.DoNotSendCookies_ViaPolicy",
277 "URLRequestTest.DoNotSaveCookies_ViaPolicy_Async", 276 "URLRequestTest.DoNotSaveCookies_ViaPolicy_Async",
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 content::InitializeSandboxInfo(&sandbox_info); 995 content::InitializeSandboxInfo(&sandbox_info);
997 FakeMainDelegate delegate; 996 FakeMainDelegate delegate;
998 content::ContentMain( 997 content::ContentMain(
999 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 998 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
1000 &sandbox_info, 999 &sandbox_info,
1001 &delegate); 1000 &delegate);
1002 1001
1003 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 1002 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
1004 return g_test_suite->test_result(); 1003 return g_test_suite->test_result();
1005 } 1004 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698