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

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

Issue 11365227: Reland 167337 - Move url_request_test_util into net namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | « chrome_frame/test/net/fake_external_tab.h ('k') | chrome_frame/test/test_server_test.cc » ('j') | 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) 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 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 ie_configurator_->RevertSettings(); 745 ie_configurator_->RevertSettings();
746 746
747 if (crash_service_) 747 if (crash_service_)
748 base::KillProcess(crash_service_, 0, false); 748 base::KillProcess(crash_service_, 0, false);
749 749
750 ::ExitProcess(1); 750 ::ExitProcess(1);
751 } 751 }
752 752
753 void CFUrlRequestUnittestRunner::OverrideHttpHost() { 753 void CFUrlRequestUnittestRunner::OverrideHttpHost() {
754 override_http_host_.reset( 754 override_http_host_.reset(
755 new ScopedCustomUrlRequestTestHttpHost( 755 new net::ScopedCustomUrlRequestTestHttpHost(
756 chrome_frame_test::GetLocalIPv4Address())); 756 chrome_frame_test::GetLocalIPv4Address()));
757 } 757 }
758 758
759 void CFUrlRequestUnittestRunner::PreEarlyInitialization() { 759 void CFUrlRequestUnittestRunner::PreEarlyInitialization() {
760 testing::InitGoogleTest(&g_argc, g_argv); 760 testing::InitGoogleTest(&g_argc, g_argv);
761 FilterDisabledTests(); 761 FilterDisabledTests();
762 StartFileLogger(); 762 StartFileLogger();
763 } 763 }
764 764
765 int CFUrlRequestUnittestRunner::PreCreateThreads() { 765 int CFUrlRequestUnittestRunner::PreCreateThreads() {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 // content::InitializeSandboxInfo(&sandbox_info); 950 // content::InitializeSandboxInfo(&sandbox_info);
951 FakeMainDelegate delegate; 951 FakeMainDelegate delegate;
952 content::ContentMain( 952 content::ContentMain(
953 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 953 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
954 &sandbox_info, 954 &sandbox_info,
955 &delegate); 955 &delegate);
956 956
957 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 957 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
958 return g_test_suite->test_result(); 958 return g_test_suite->test_result();
959 } 959 }
OLDNEW
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.h ('k') | chrome_frame/test/test_server_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698