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

Side by Side Diff: remoting/protocol/me2me_host_authenticator_factory.cc

Issue 16964002: Rewrite scoped_ptr<T>(NULL) to use the default ctor in remoting/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 "remoting/protocol/me2me_host_authenticator_factory.h" 5 #include "remoting/protocol/me2me_host_authenticator_factory.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "remoting/base/rsa_key_pair.h" 9 #include "remoting/base/rsa_key_pair.h"
10 #include "remoting/protocol/channel_authenticator.h" 10 #include "remoting/protocol/channel_authenticator.h"
(...skipping 25 matching lines...) Expand all
36 36
37 virtual void ProcessMessage(const buzz::XmlElement* message, 37 virtual void ProcessMessage(const buzz::XmlElement* message,
38 const base::Closure& resume_callback) OVERRIDE { 38 const base::Closure& resume_callback) OVERRIDE {
39 DCHECK_EQ(state_, WAITING_MESSAGE); 39 DCHECK_EQ(state_, WAITING_MESSAGE);
40 state_ = REJECTED; 40 state_ = REJECTED;
41 resume_callback.Run(); 41 resume_callback.Run();
42 } 42 }
43 43
44 virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE { 44 virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE {
45 NOTREACHED(); 45 NOTREACHED();
46 return scoped_ptr<buzz::XmlElement>(NULL); 46 return scoped_ptr<buzz::XmlElement>();
47 } 47 }
48 48
49 virtual scoped_ptr<ChannelAuthenticator> 49 virtual scoped_ptr<ChannelAuthenticator>
50 CreateChannelAuthenticator() const OVERRIDE { 50 CreateChannelAuthenticator() const OVERRIDE {
51 NOTREACHED(); 51 NOTREACHED();
52 return scoped_ptr<ChannelAuthenticator>(NULL); 52 return scoped_ptr<ChannelAuthenticator>();
53 } 53 }
54 54
55 protected: 55 protected:
56 State state_; 56 State state_;
57 }; 57 };
58 58
59 } // namespace 59 } // namespace
60 60
61 // static 61 // static
62 scoped_ptr<AuthenticatorFactory> 62 scoped_ptr<AuthenticatorFactory>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 return NegotiatingHostAuthenticator::CreateWithSharedSecret( 134 return NegotiatingHostAuthenticator::CreateWithSharedSecret(
135 local_cert_, key_pair_, shared_secret_hash_.value, 135 local_cert_, key_pair_, shared_secret_hash_.value,
136 shared_secret_hash_.hash_function, pairing_registry_); 136 shared_secret_hash_.hash_function, pairing_registry_);
137 } 137 }
138 138
139 return scoped_ptr<Authenticator>(new RejectingAuthenticator()); 139 return scoped_ptr<Authenticator>(new RejectingAuthenticator());
140 } 140 }
141 141
142 } // namespace protocol 142 } // namespace protocol
143 } // namespace remoting 143 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698