OLD | NEW |
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/browser/extensions/user_script_listener.h" | 5 #include "chrome/browser/extensions/user_script_listener.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/json/json_file_value_serializer.h" | 10 #include "base/json/json_file_value_serializer.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 14 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/extensions/extension_service.h" | 15 #include "chrome/browser/extensions/extension_service.h" |
16 #include "chrome/browser/extensions/extension_service_test_base.h" | 16 #include "chrome/browser/extensions/extension_service_test_base.h" |
17 #include "chrome/browser/extensions/unpacked_installer.h" | 17 #include "chrome/browser/extensions/unpacked_installer.h" |
18 #include "chrome/common/chrome_paths.h" | 18 #include "chrome/common/chrome_paths.h" |
19 #include "chrome/test/base/testing_profile.h" | 19 #include "chrome/test/base/testing_profile.h" |
20 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
21 #include "content/public/browser/resource_controller.h" | |
22 #include "content/public/browser/resource_throttle.h" | 21 #include "content/public/browser/resource_throttle.h" |
23 #include "extensions/browser/extension_registry.h" | 22 #include "extensions/browser/extension_registry.h" |
24 #include "net/base/request_priority.h" | 23 #include "net/base/request_priority.h" |
25 #include "net/url_request/url_request.h" | 24 #include "net/url_request/url_request.h" |
26 #include "net/url_request/url_request_filter.h" | 25 #include "net/url_request/url_request_filter.h" |
27 #include "net/url_request/url_request_interceptor.h" | 26 #include "net/url_request/url_request_interceptor.h" |
28 #include "net/url_request/url_request_test_job.h" | 27 #include "net/url_request/url_request_test_job.h" |
29 #include "net/url_request/url_request_test_util.h" | 28 #include "net/url_request/url_request_test_util.h" |
30 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
31 | 30 |
32 using content::ResourceController; | |
33 using content::ResourceThrottle; | 31 using content::ResourceThrottle; |
34 | 32 |
35 namespace extensions { | 33 namespace extensions { |
36 | 34 |
37 namespace { | 35 namespace { |
38 | 36 |
39 const char kMatchingUrl[] = "http://google.com/"; | 37 const char kMatchingUrl[] = "http://google.com/"; |
40 const char kNotMatchingUrl[] = "http://example.com/"; | 38 const char kNotMatchingUrl[] = "http://example.com/"; |
41 const char kTestData[] = "Hello, World!"; | 39 const char kTestData[] = "Hello, World!"; |
42 | 40 |
43 class ThrottleController : public base::SupportsUserData::Data, | 41 class ThrottleDelegate : public base::SupportsUserData::Data, |
44 public ResourceController { | 42 public ResourceThrottle::Delegate { |
45 public: | 43 public: |
46 ThrottleController(net::URLRequest* request, ResourceThrottle* throttle) | 44 ThrottleDelegate(net::URLRequest* request, ResourceThrottle* throttle) |
47 : request_(request), | 45 : request_(request), throttle_(throttle) { |
48 throttle_(throttle) { | 46 throttle_->set_delegate_for_testing(this); |
49 throttle_->set_controller_for_testing(this); | |
50 } | 47 } |
51 | 48 |
52 // ResourceController implementation: | 49 // ResourceThrottle::Delegate implementation: |
53 void Resume() override { request_->Start(); } | 50 void Resume() override { request_->Start(); } |
54 void Cancel() override { NOTREACHED(); } | 51 void Cancel() override { NOTREACHED(); } |
55 void CancelAndIgnore() override { NOTREACHED(); } | 52 void CancelAndIgnore() override { NOTREACHED(); } |
56 void CancelWithError(int error_code) override { NOTREACHED(); } | 53 void CancelWithError(int error_code) override { NOTREACHED(); } |
57 | 54 |
58 private: | 55 private: |
59 net::URLRequest* request_; | 56 net::URLRequest* request_; |
60 std::unique_ptr<ResourceThrottle> throttle_; | 57 std::unique_ptr<ResourceThrottle> throttle_; |
61 }; | 58 }; |
62 | 59 |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 net::TestURLRequestContext* context) { | 156 net::TestURLRequestContext* context) { |
160 GURL url(url_string); | 157 GURL url(url_string); |
161 std::unique_ptr<net::URLRequest> request( | 158 std::unique_ptr<net::URLRequest> request( |
162 context->CreateRequest(url, net::DEFAULT_PRIORITY, delegate)); | 159 context->CreateRequest(url, net::DEFAULT_PRIORITY, delegate)); |
163 | 160 |
164 ResourceThrottle* throttle = listener_->CreateResourceThrottle( | 161 ResourceThrottle* throttle = listener_->CreateResourceThrottle( |
165 url, content::RESOURCE_TYPE_MAIN_FRAME); | 162 url, content::RESOURCE_TYPE_MAIN_FRAME); |
166 | 163 |
167 bool defer = false; | 164 bool defer = false; |
168 if (throttle) { | 165 if (throttle) { |
169 request->SetUserData(NULL, | 166 request->SetUserData(nullptr, |
170 new ThrottleController(request.get(), throttle)); | 167 new ThrottleDelegate(request.get(), throttle)); |
171 | 168 |
172 throttle->WillStartRequest(&defer); | 169 throttle->WillStartRequest(&defer); |
173 } | 170 } |
174 | 171 |
175 if (!defer) | 172 if (!defer) |
176 request->Start(); | 173 request->Start(); |
177 | 174 |
178 return request; | 175 return request; |
179 } | 176 } |
180 | 177 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 base::RunLoop().RunUntilIdle(); | 324 base::RunLoop().RunUntilIdle(); |
328 net::TestDelegate delegate; | 325 net::TestDelegate delegate; |
329 net::TestURLRequestContext context; | 326 net::TestURLRequestContext context; |
330 GURL url(kMatchingUrl); | 327 GURL url(kMatchingUrl); |
331 std::unique_ptr<net::URLRequest> request( | 328 std::unique_ptr<net::URLRequest> request( |
332 context.CreateRequest(url, net::DEFAULT_PRIORITY, &delegate)); | 329 context.CreateRequest(url, net::DEFAULT_PRIORITY, &delegate)); |
333 | 330 |
334 ResourceThrottle* throttle = | 331 ResourceThrottle* throttle = |
335 listener_->CreateResourceThrottle(url, content::RESOURCE_TYPE_MAIN_FRAME); | 332 listener_->CreateResourceThrottle(url, content::RESOURCE_TYPE_MAIN_FRAME); |
336 ASSERT_TRUE(throttle); | 333 ASSERT_TRUE(throttle); |
337 request->SetUserData(NULL, new ThrottleController(request.get(), throttle)); | 334 request->SetUserData(nullptr, new ThrottleDelegate(request.get(), throttle)); |
338 | 335 |
339 ASSERT_FALSE(request->is_pending()); | 336 ASSERT_FALSE(request->is_pending()); |
340 | 337 |
341 content::NotificationService::current()->Notify( | 338 content::NotificationService::current()->Notify( |
342 extensions::NOTIFICATION_USER_SCRIPTS_UPDATED, | 339 extensions::NOTIFICATION_USER_SCRIPTS_UPDATED, |
343 content::Source<Profile>(profile_.get()), | 340 content::Source<Profile>(profile_.get()), |
344 content::NotificationService::NoDetails()); | 341 content::NotificationService::NoDetails()); |
345 base::RunLoop().RunUntilIdle(); | 342 base::RunLoop().RunUntilIdle(); |
346 | 343 |
347 bool defer = false; | 344 bool defer = false; |
348 throttle->WillStartRequest(&defer); | 345 throttle->WillStartRequest(&defer); |
349 ASSERT_FALSE(defer); | 346 ASSERT_FALSE(defer); |
350 } | 347 } |
351 | 348 |
352 } // namespace | 349 } // namespace |
353 | 350 |
354 } // namespace extensions | 351 } // namespace extensions |
OLD | NEW |