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

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

Issue 11308333: build fix attempt (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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) 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // content logic. We use a subclass of Chrome's implementation, 161 // content logic. We use a subclass of Chrome's implementation,
162 // FakeContentBrowserClient, to override CreateBrowserMainParts. Must 162 // FakeContentBrowserClient, to override CreateBrowserMainParts. Must
163 // be done before any tabs are created. 163 // be done before any tabs are created.
164 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE { 164 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE {
165 return &g_browser_client.Get(); 165 return &g_browser_client.Get();
166 }; 166 };
167 }; 167 };
168 168
169 void FilterDisabledTests() { 169 void FilterDisabledTests() {
170 if (::testing::FLAGS_gtest_filter.length() && 170 if (::testing::FLAGS_gtest_filter.length() &&
171 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { 171 ::testing::FLAGS_gtest_filter != "*") {
172 // Don't override user specified filters. 172 // Don't override user specified filters.
173 return; 173 return;
174 } 174 }
175 175
176 const char* disabled_tests[] = { 176 const char* disabled_tests[] = {
177 // Tests disabled since they're testing the same functionality used 177 // Tests disabled since they're testing the same functionality used
178 // by the TestAutomationProvider. 178 // by the TestAutomationProvider.
179 "URLRequestTest.Intercept", 179 "URLRequestTest.Intercept",
180 "URLRequestTest.InterceptNetworkError", 180 "URLRequestTest.InterceptNetworkError",
181 "URLRequestTest.InterceptRestartRequired", 181 "URLRequestTest.InterceptRestartRequired",
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 // content::InitializeSandboxInfo(&sandbox_info); 951 // content::InitializeSandboxInfo(&sandbox_info);
952 FakeMainDelegate delegate; 952 FakeMainDelegate delegate;
953 content::ContentMain( 953 content::ContentMain(
954 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 954 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
955 &sandbox_info, 955 &sandbox_info,
956 &delegate); 956 &delegate);
957 957
958 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 958 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
959 return g_test_suite->test_result(); 959 return g_test_suite->test_result();
960 } 960 }
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