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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 11931024: Removed static factories for data, ftp, file, and about jobs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 7 years, 11 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 <map> 5 #include <map>
6 #include <queue> 6 #include <queue>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/json/json_string_value_serializer.h" 13 #include "base/json/json_string_value_serializer.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/prefs/public/pref_member.h" 17 #include "base/prefs/public/pref_member.h"
18 #include "base/stl_util.h" 18 #include "base/stl_util.h"
19 #include "base/string_piece.h" 19 #include "base/string_piece.h"
20 #include "base/stringprintf.h" 20 #include "base/stringprintf.h"
21 #include "base/time.h" 21 #include "base/time.h"
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "chrome/browser/content_settings/cookie_settings.h" 23 #include "chrome/browser/content_settings/cookie_settings.h"
24 #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h" 24 #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h"
25 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 25 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
26 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" 26 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h"
27 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" 27 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
28 #include "chrome/browser/extensions/event_router_forwarder.h" 28 #include "chrome/browser/extensions/event_router_forwarder.h"
29 #include "chrome/browser/extensions/extension_warning_set.h" 29 #include "chrome/browser/extensions/extension_warning_set.h"
30 #include "chrome/browser/net/about_protocol_handler.h"
30 #include "chrome/browser/net/chrome_network_delegate.h" 31 #include "chrome/browser/net/chrome_network_delegate.h"
31 #include "chrome/common/extensions/extension_messages.h" 32 #include "chrome/common/extensions/extension_messages.h"
32 #include "chrome/common/extensions/features/feature.h" 33 #include "chrome/common/extensions/features/feature.h"
33 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
34 #include "chrome/test/base/testing_browser_process.h" 35 #include "chrome/test/base/testing_browser_process.h"
35 #include "chrome/test/base/testing_pref_service.h" 36 #include "chrome/test/base/testing_pref_service.h"
36 #include "chrome/test/base/testing_profile.h" 37 #include "chrome/test/base/testing_profile.h"
38 #include "content/public/common/url_constants.h"
37 #include "content/public/test/test_browser_thread.h" 39 #include "content/public/test/test_browser_thread.h"
38 #include "net/base/auth.h" 40 #include "net/base/auth.h"
39 #include "net/base/capturing_net_log.h" 41 #include "net/base/capturing_net_log.h"
40 #include "net/base/mock_host_resolver.h" 42 #include "net/base/mock_host_resolver.h"
41 #include "net/base/net_util.h" 43 #include "net/base/net_util.h"
42 #include "net/base/upload_bytes_element_reader.h" 44 #include "net/base/upload_bytes_element_reader.h"
43 #include "net/base/upload_data_stream.h" 45 #include "net/base/upload_data_stream.h"
44 #include "net/base/upload_file_element_reader.h" 46 #include "net/base/upload_file_element_reader.h"
47 #include "net/url_request/url_request_job_factory_impl.h"
45 #include "net/url_request/url_request_test_util.h" 48 #include "net/url_request/url_request_test_util.h"
46 #include "testing/gtest/include/gtest/gtest.h" 49 #include "testing/gtest/include/gtest/gtest.h"
47 50
48 namespace helpers = extension_web_request_api_helpers; 51 namespace helpers = extension_web_request_api_helpers;
49 namespace keys = extension_web_request_api_constants; 52 namespace keys = extension_web_request_api_constants;
50 53
51 using base::BinaryValue; 54 using base::BinaryValue;
52 using base::DictionaryValue; 55 using base::DictionaryValue;
53 using base::ListValue; 56 using base::ListValue;
54 using base::StringValue; 57 using base::StringValue;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_); 220 base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
218 ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( 221 ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
219 &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1", 222 &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
220 filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 223 filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
221 ipc_sender_factory.GetWeakPtr()); 224 ipc_sender_factory.GetWeakPtr());
222 ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( 225 ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
223 &profile_, extension2_id, extension2_id, kEventName, kEventName + "/2", 226 &profile_, extension2_id, extension2_id, kEventName, kEventName + "/2",
224 filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 227 filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
225 ipc_sender_factory.GetWeakPtr()); 228 ipc_sender_factory.GetWeakPtr());
226 229
230 net::URLRequestJobFactoryImpl job_factory;
231 job_factory.SetProtocolHandler(
232 chrome::kAboutScheme,
233 new chrome_browser_net::AboutProtocolHandler());
234 context_->set_job_factory(&job_factory);
235
227 GURL redirect_url("about:redirected"); 236 GURL redirect_url("about:redirected");
228 GURL not_chosen_redirect_url("about:not_chosen"); 237 GURL not_chosen_redirect_url("about:not_chosen");
229 238
230 net::URLRequest request(GURL("about:blank"), &delegate_, context_.get()); 239 net::URLRequest request(GURL("about:blank"), &delegate_, context_.get());
231 { 240 {
232 // onBeforeRequest will be dispatched twice initially. The second response - 241 // onBeforeRequest will be dispatched twice initially. The second response -
233 // the redirect - should win, since it has a later |install_time|. The 242 // the redirect - should win, since it has a later |install_time|. The
234 // redirect will dispatch another pair of onBeforeRequest. There, the first 243 // redirect will dispatch another pair of onBeforeRequest. There, the first
235 // response should win (later |install_time|). 244 // response should win (later |install_time|).
236 ExtensionWebRequestEventRouter::EventResponse* response = NULL; 245 ExtensionWebRequestEventRouter::EventResponse* response = NULL;
(...skipping 1909 matching lines...) Expand 10 before | Expand all | Expand 10 after
2146 EXPECT_TRUE(credentials_set); 2155 EXPECT_TRUE(credentials_set);
2147 EXPECT_FALSE(auth3.Empty()); 2156 EXPECT_FALSE(auth3.Empty());
2148 EXPECT_EQ(username, auth1.username()); 2157 EXPECT_EQ(username, auth1.username());
2149 EXPECT_EQ(password, auth1.password()); 2158 EXPECT_EQ(password, auth1.password());
2150 EXPECT_EQ(1u, warning_set.size()); 2159 EXPECT_EQ(1u, warning_set.size());
2151 EXPECT_TRUE(HasWarning(warning_set, "extid2")); 2160 EXPECT_TRUE(HasWarning(warning_set, "extid2"));
2152 EXPECT_EQ(3u, capturing_net_log.GetSize()); 2161 EXPECT_EQ(3u, capturing_net_log.GetSize());
2153 } 2162 }
2154 2163
2155 } // namespace extensions 2164 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698