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

Side by Side Diff: trunk/src/net/socket_stream/socket_stream_job_manager.cc

Issue 197463003: Revert 256579 "Allow the content browser client to specify a spe..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "net/socket_stream/socket_stream_job_manager.h" 5 #include "net/socket_stream/socket_stream_job_manager.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 8
9 namespace net { 9 namespace net {
10 10
11 SocketStreamJobManager::SocketStreamJobManager() { 11 SocketStreamJobManager::SocketStreamJobManager() {
12 } 12 }
13 13
14 SocketStreamJobManager::~SocketStreamJobManager() { 14 SocketStreamJobManager::~SocketStreamJobManager() {
15 } 15 }
16 16
17 // static 17 // static
18 SocketStreamJobManager* SocketStreamJobManager::GetInstance() { 18 SocketStreamJobManager* SocketStreamJobManager::GetInstance() {
19 return Singleton<SocketStreamJobManager>::get(); 19 return Singleton<SocketStreamJobManager>::get();
20 } 20 }
21 21
22 SocketStreamJob* SocketStreamJobManager::CreateJob( 22 SocketStreamJob* SocketStreamJobManager::CreateJob(
23 const GURL& url, SocketStream::Delegate* delegate, 23 const GURL& url, SocketStream::Delegate* delegate) const {
24 URLRequestContext* context, CookieStore* cookie_store) const {
25 // If url is invalid, create plain SocketStreamJob, which will close 24 // If url is invalid, create plain SocketStreamJob, which will close
26 // the socket immediately. 25 // the socket immediately.
27 if (!url.is_valid()) { 26 if (!url.is_valid()) {
28 SocketStreamJob* job = new SocketStreamJob(); 27 SocketStreamJob* job = new SocketStreamJob();
29 job->InitSocketStream(new SocketStream(url, delegate, context, 28 job->InitSocketStream(new SocketStream(url, delegate));
30 cookie_store));
31 return job; 29 return job;
32 } 30 }
33 31
34 const std::string& scheme = url.scheme(); // already lowercase 32 const std::string& scheme = url.scheme(); // already lowercase
35 33
36 base::AutoLock locked(lock_); 34 base::AutoLock locked(lock_);
37 FactoryMap::const_iterator found = factories_.find(scheme); 35 FactoryMap::const_iterator found = factories_.find(scheme);
38 if (found != factories_.end()) { 36 if (found != factories_.end()) {
39 SocketStreamJob* job = found->second(url, delegate, context, cookie_store); 37 SocketStreamJob* job = found->second(url, delegate);
40 if (job) 38 if (job)
41 return job; 39 return job;
42 } 40 }
43 SocketStreamJob* job = new SocketStreamJob(); 41 SocketStreamJob* job = new SocketStreamJob();
44 job->InitSocketStream(new SocketStream(url, delegate, context, cookie_store)); 42 job->InitSocketStream(new SocketStream(url, delegate));
45 return job; 43 return job;
46 } 44 }
47 45
48 SocketStreamJob::ProtocolFactory* 46 SocketStreamJob::ProtocolFactory*
49 SocketStreamJobManager::RegisterProtocolFactory( 47 SocketStreamJobManager::RegisterProtocolFactory(
50 const std::string& scheme, SocketStreamJob::ProtocolFactory* factory) { 48 const std::string& scheme, SocketStreamJob::ProtocolFactory* factory) {
51 base::AutoLock locked(lock_); 49 base::AutoLock locked(lock_);
52 50
53 SocketStreamJob::ProtocolFactory* old_factory; 51 SocketStreamJob::ProtocolFactory* old_factory;
54 FactoryMap::iterator found = factories_.find(scheme); 52 FactoryMap::iterator found = factories_.find(scheme);
55 if (found != factories_.end()) { 53 if (found != factories_.end()) {
56 old_factory = found->second; 54 old_factory = found->second;
57 } else { 55 } else {
58 old_factory = NULL; 56 old_factory = NULL;
59 } 57 }
60 if (factory) { 58 if (factory) {
61 factories_[scheme] = factory; 59 factories_[scheme] = factory;
62 } else if (found != factories_.end()) { 60 } else if (found != factories_.end()) {
63 factories_.erase(found); 61 factories_.erase(found);
64 } 62 }
65 return old_factory; 63 return old_factory;
66 } 64 }
67 65
68 } // namespace net 66 } // namespace net
OLDNEW
« no previous file with comments | « trunk/src/net/socket_stream/socket_stream_job_manager.h ('k') | trunk/src/net/socket_stream/socket_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698