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

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

Issue 11410066: Revert 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/test/base/testing_profile.cc ('k') | chrome_frame/test/net/fake_external_tab.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 #ifndef CHROME_FRAME_TEST_NET_FAKE_EXTERNAL_TAB_H_ 5 #ifndef CHROME_FRAME_TEST_NET_FAKE_EXTERNAL_TAB_H_
6 #define CHROME_FRAME_TEST_NET_FAKE_EXTERNAL_TAB_H_ 6 #define CHROME_FRAME_TEST_NET_FAKE_EXTERNAL_TAB_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/cancelable_callback.h" 10 #include "base/cancelable_callback.h"
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/process.h" 13 #include "base/process.h"
14 #include "base/win/scoped_handle.h" 14 #include "base/win/scoped_handle.h"
15 #include "chrome/browser/browser_process_impl.h" 15 #include "chrome/browser/browser_process_impl.h"
16 #include "chrome_frame/test/net/test_automation_provider.h" 16 #include "chrome_frame/test/net/test_automation_provider.h"
17 #include "chrome_frame/test/test_server.h" 17 #include "chrome_frame/test/test_server.h"
18 #include "chrome_frame/test_utils.h" 18 #include "chrome_frame/test_utils.h"
19 #include "content/public/browser/browser_main_parts.h" 19 #include "content/public/browser/browser_main_parts.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "net/base/net_test_suite.h" 21 #include "net/base/net_test_suite.h"
22 22
23 class CommandLine; 23 class CommandLine;
24 class FakeBrowserProcessImpl; 24 class FakeBrowserProcessImpl;
25 class ProcessSingleton; 25 class ProcessSingleton;
26
27 namespace net {
28 class ScopedCustomUrlRequestTestHttpHost; 26 class ScopedCustomUrlRequestTestHttpHost;
29 } // namespace net
30 27
31 namespace content { 28 namespace content {
32 class NotificationService; 29 class NotificationService;
33 } // namespace content 30 } // namespace content
34 31
35 namespace logging_win { 32 namespace logging_win {
36 class FileLogger; 33 class FileLogger;
37 } // namespace logging_win 34 } // namespace logging_win
38 35
39 namespace chrome_frame_test { 36 namespace chrome_frame_test {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 // will be called. 115 // will be called.
119 static DWORD WINAPI RunAllUnittests(void* param); 116 static DWORD WINAPI RunAllUnittests(void* param);
120 117
121 void TakeDownBrowser(); 118 void TakeDownBrowser();
122 119
123 protected: 120 protected:
124 base::win::ScopedHandle test_thread_; 121 base::win::ScopedHandle test_thread_;
125 base::ProcessHandle crash_service_; 122 base::ProcessHandle crash_service_;
126 DWORD test_thread_id_; 123 DWORD test_thread_id_;
127 124
128 scoped_ptr<net::ScopedCustomUrlRequestTestHttpHost> override_http_host_; 125 scoped_ptr<ScopedCustomUrlRequestTestHttpHost> override_http_host_;
129 126
130 scoped_ptr<test_server::SimpleWebServer> test_http_server_; 127 scoped_ptr<test_server::SimpleWebServer> test_http_server_;
131 test_server::SimpleResponse chrome_frame_html_; 128 test_server::SimpleResponse chrome_frame_html_;
132 129
133 // The fake chrome instance. 130 // The fake chrome instance.
134 scoped_ptr<FakeExternalTab> fake_chrome_; 131 scoped_ptr<FakeExternalTab> fake_chrome_;
135 ScopedChromeFrameRegistrar registrar_; 132 ScopedChromeFrameRegistrar registrar_;
136 int test_result_; 133 int test_result_;
137 134
138 private: 135 private:
(...skipping 17 matching lines...) Expand all
156 scoped_ptr<ProcessSingleton> process_singleton_; 153 scoped_ptr<ProcessSingleton> process_singleton_;
157 base::CancelableClosure timeout_closure_; 154 base::CancelableClosure timeout_closure_;
158 scoped_ptr<logging_win::FileLogger> file_logger_; 155 scoped_ptr<logging_win::FileLogger> file_logger_;
159 FilePath log_file_; 156 FilePath log_file_;
160 scoped_ptr<chrome_frame_test::IEConfigurator> ie_configurator_; 157 scoped_ptr<chrome_frame_test::IEConfigurator> ie_configurator_;
161 158
162 DISALLOW_COPY_AND_ASSIGN(CFUrlRequestUnittestRunner); 159 DISALLOW_COPY_AND_ASSIGN(CFUrlRequestUnittestRunner);
163 }; 160 };
164 161
165 #endif // CHROME_FRAME_TEST_NET_FAKE_EXTERNAL_TAB_H_ 162 #endif // CHROME_FRAME_TEST_NET_FAKE_EXTERNAL_TAB_H_
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile.cc ('k') | chrome_frame/test/net/fake_external_tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698