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

Side by Side Diff: chrome/browser/extensions/extension_protocols_unittest.cc

Issue 14694010: Consolidate manifest handler registration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 <string> 5 #include <string>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/extensions/extension_info_map.h" 10 #include "chrome/browser/extensions/extension_info_map.h"
11 #include "chrome/browser/extensions/extension_protocols.h" 11 #include "chrome/browser/extensions/extension_protocols.h"
12 #include "chrome/common/chrome_paths.h" 12 #include "chrome/common/chrome_paths.h"
13 #include "chrome/common/extensions/extension.h" 13 #include "chrome/common/extensions/extension.h"
14 #include "chrome/common/extensions/extension_manifest_constants.h" 14 #include "chrome/common/extensions/extension_manifest_constants.h"
15 #include "chrome/common/extensions/incognito_handler.h"
16 #include "chrome/common/extensions/manifest_handler.h"
17 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
18 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
19 #include "content/public/browser/resource_request_info.h" 16 #include "content/public/browser/resource_request_info.h"
20 #include "content/public/test/mock_resource_context.h" 17 #include "content/public/test/mock_resource_context.h"
21 #include "content/public/test/test_browser_thread.h" 18 #include "content/public/test/test_browser_thread.h"
22 #include "extensions/common/constants.h" 19 #include "extensions/common/constants.h"
23 #include "net/url_request/url_request.h" 20 #include "net/url_request/url_request.h"
24 #include "net/url_request/url_request_job_factory_impl.h" 21 #include "net/url_request/url_request_job_factory_impl.h"
25 #include "net/url_request/url_request_status.h" 22 #include "net/url_request/url_request_status.h"
26 #include "net/url_request/url_request_test_util.h" 23 #include "net/url_request/url_request_test_util.h"
27 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 : ui_thread_(BrowserThread::UI, &message_loop_), 69 : ui_thread_(BrowserThread::UI, &message_loop_),
73 file_thread_(BrowserThread::FILE, &message_loop_), 70 file_thread_(BrowserThread::FILE, &message_loop_),
74 io_thread_(BrowserThread::IO, &message_loop_) {} 71 io_thread_(BrowserThread::IO, &message_loop_) {}
75 72
76 virtual void SetUp() OVERRIDE { 73 virtual void SetUp() OVERRIDE {
77 testing::Test::SetUp(); 74 testing::Test::SetUp();
78 extension_info_map_ = new ExtensionInfoMap(); 75 extension_info_map_ = new ExtensionInfoMap();
79 net::URLRequestContext* request_context = 76 net::URLRequestContext* request_context =
80 resource_context_.GetRequestContext(); 77 resource_context_.GetRequestContext();
81 old_factory_ = request_context->job_factory(); 78 old_factory_ = request_context->job_factory();
82 (new IncognitoHandler)->Register();
83 (new IconsHandler)->Register();
84 } 79 }
85 80
86 virtual void TearDown() { 81 virtual void TearDown() {
87 net::URLRequestContext* request_context = 82 net::URLRequestContext* request_context =
88 resource_context_.GetRequestContext(); 83 resource_context_.GetRequestContext();
89 request_context->set_job_factory(old_factory_); 84 request_context->set_job_factory(old_factory_);
90 ManifestHandler::ClearRegistryForTesting();
91 } 85 }
92 86
93 void SetProtocolHandler(bool incognito) { 87 void SetProtocolHandler(bool incognito) {
94 net::URLRequestContext* request_context = 88 net::URLRequestContext* request_context =
95 resource_context_.GetRequestContext(); 89 resource_context_.GetRequestContext();
96 job_factory_.SetProtocolHandler( 90 job_factory_.SetProtocolHandler(
97 kExtensionScheme, 91 kExtensionScheme,
98 CreateExtensionProtocolHandler(incognito, extension_info_map_)); 92 CreateExtensionProtocolHandler(incognito, extension_info_map_));
99 request_context->set_job_factory(&job_factory_); 93 request_context->set_job_factory(&job_factory_);
100 } 94 }
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 { 210 {
217 net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"), 211 net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
218 &test_delegate_, 212 &test_delegate_,
219 resource_context_.GetRequestContext()); 213 resource_context_.GetRequestContext());
220 StartRequest(&request, ResourceType::MEDIA); 214 StartRequest(&request, ResourceType::MEDIA);
221 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); 215 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
222 } 216 }
223 } 217 }
224 218
225 } // namespace extensions 219 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698