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

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

Issue 7663015: Fix ChromeFrame net tests hang on the windows try bots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 10
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 watchdog.AddObserver(&credentials, "Windows Security", ""); 571 watchdog.AddObserver(&credentials, "Windows Security", "");
572 testing::InitGoogleTest(&argc, argv); 572 testing::InitGoogleTest(&argc, argv);
573 FilterDisabledTests(); 573 FilterDisabledTests();
574 test_suite.RunMainUIThread(); 574 test_suite.RunMainUIThread();
575 575
576 if (crash_service) 576 if (crash_service)
577 base::KillProcess(crash_service, 0, false); 577 base::KillProcess(crash_service, 0, false);
578 578
579 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); 579 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
580 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); 580 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
581 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which
582 // check if globals are created and destroyed on the same thread don't fire.
583 // Webkit global objects are created on the inproc renderer thread.
584 #if !defined(NDEBUG)
585 ExitProcess(test_suite.test_result());
586 #endif // NDEBUG
581 return test_suite.test_result(); 587 return test_suite.test_result();
582 } 588 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698