| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "chrome/browser/extensions/extension_info_map.h" | |
| 13 #include "chrome/browser/extensions/extension_protocols.h" | 12 #include "chrome/browser/extensions/extension_protocols.h" |
| 14 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
| 15 #include "chrome/common/extensions/extension.h" | 14 #include "chrome/common/extensions/extension.h" |
| 16 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
| 17 #include "content/public/browser/resource_request_info.h" | 16 #include "content/public/browser/resource_request_info.h" |
| 18 #include "content/public/test/mock_resource_context.h" | 17 #include "content/public/test/mock_resource_context.h" |
| 19 #include "content/public/test/test_browser_thread_bundle.h" | 18 #include "content/public/test/test_browser_thread_bundle.h" |
| 19 #include "extensions/browser/info_map.h" |
| 20 #include "extensions/common/constants.h" | 20 #include "extensions/common/constants.h" |
| 21 #include "net/base/request_priority.h" | 21 #include "net/base/request_priority.h" |
| 22 #include "net/url_request/url_request.h" | 22 #include "net/url_request/url_request.h" |
| 23 #include "net/url_request/url_request_job_factory_impl.h" | 23 #include "net/url_request/url_request_job_factory_impl.h" |
| 24 #include "net/url_request/url_request_status.h" | 24 #include "net/url_request/url_request_status.h" |
| 25 #include "net/url_request/url_request_test_util.h" | 25 #include "net/url_request/url_request_test_util.h" |
| 26 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
| 27 | 27 |
| 28 namespace extensions { | 28 namespace extensions { |
| 29 | 29 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 } | 87 } |
| 88 | 88 |
| 89 class ExtensionProtocolTest : public testing::Test { | 89 class ExtensionProtocolTest : public testing::Test { |
| 90 public: | 90 public: |
| 91 ExtensionProtocolTest() | 91 ExtensionProtocolTest() |
| 92 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), | 92 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), |
| 93 resource_context_(&test_url_request_context_) {} | 93 resource_context_(&test_url_request_context_) {} |
| 94 | 94 |
| 95 virtual void SetUp() OVERRIDE { | 95 virtual void SetUp() OVERRIDE { |
| 96 testing::Test::SetUp(); | 96 testing::Test::SetUp(); |
| 97 extension_info_map_ = new ExtensionInfoMap(); | 97 extension_info_map_ = new InfoMap(); |
| 98 net::URLRequestContext* request_context = | 98 net::URLRequestContext* request_context = |
| 99 resource_context_.GetRequestContext(); | 99 resource_context_.GetRequestContext(); |
| 100 old_factory_ = request_context->job_factory(); | 100 old_factory_ = request_context->job_factory(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 virtual void TearDown() { | 103 virtual void TearDown() { |
| 104 net::URLRequestContext* request_context = | 104 net::URLRequestContext* request_context = |
| 105 resource_context_.GetRequestContext(); | 105 resource_context_.GetRequestContext(); |
| 106 request_context->set_job_factory(old_factory_); | 106 request_context->set_job_factory(old_factory_); |
| 107 } | 107 } |
| (...skipping 14 matching lines...) Expand all Loading... |
| 122 &resource_context_, | 122 &resource_context_, |
| 123 -1, | 123 -1, |
| 124 -1, | 124 -1, |
| 125 false); | 125 false); |
| 126 request->Start(); | 126 request->Start(); |
| 127 base::MessageLoop::current()->Run(); | 127 base::MessageLoop::current()->Run(); |
| 128 } | 128 } |
| 129 | 129 |
| 130 protected: | 130 protected: |
| 131 content::TestBrowserThreadBundle thread_bundle_; | 131 content::TestBrowserThreadBundle thread_bundle_; |
| 132 scoped_refptr<ExtensionInfoMap> extension_info_map_; | 132 scoped_refptr<InfoMap> extension_info_map_; |
| 133 net::URLRequestJobFactoryImpl job_factory_; | 133 net::URLRequestJobFactoryImpl job_factory_; |
| 134 const net::URLRequestJobFactory* old_factory_; | 134 const net::URLRequestJobFactory* old_factory_; |
| 135 net::TestDelegate test_delegate_; | 135 net::TestDelegate test_delegate_; |
| 136 net::TestURLRequestContext test_url_request_context_; | 136 net::TestURLRequestContext test_url_request_context_; |
| 137 content::MockResourceContext resource_context_; | 137 content::MockResourceContext resource_context_; |
| 138 }; | 138 }; |
| 139 | 139 |
| 140 // Tests that making a chrome-extension request in an incognito context is | 140 // Tests that making a chrome-extension request in an incognito context is |
| 141 // only allowed under the right circumstances (if the extension is allowed | 141 // only allowed under the right circumstances (if the extension is allowed |
| 142 // in incognito, and it's either a non-main-frame request or a split-mode | 142 // in incognito, and it's either a non-main-frame request or a split-mode |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 net::URLRequest request(extension->GetResourceURL("test.dat"), | 319 net::URLRequest request(extension->GetResourceURL("test.dat"), |
| 320 net::DEFAULT_PRIORITY, | 320 net::DEFAULT_PRIORITY, |
| 321 &test_delegate_, | 321 &test_delegate_, |
| 322 resource_context_.GetRequestContext()); | 322 resource_context_.GetRequestContext()); |
| 323 StartRequest(&request, ResourceType::MEDIA); | 323 StartRequest(&request, ResourceType::MEDIA); |
| 324 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); | 324 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); |
| 325 } | 325 } |
| 326 } | 326 } |
| 327 | 327 |
| 328 } // namespace extensions | 328 } // namespace extensions |
| OLD | NEW |