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

Side by Side Diff: extensions/browser/api/cast_channel/cast_socket.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/api/cast_channel/cast_socket.h" 5 #include "extensions/browser/api/cast_channel/cast_socket.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 class FakeCertVerifier : public net::CertVerifier { 81 class FakeCertVerifier : public net::CertVerifier {
82 public: 82 public:
83 FakeCertVerifier() {} 83 FakeCertVerifier() {}
84 ~FakeCertVerifier() override {} 84 ~FakeCertVerifier() override {}
85 85
86 int Verify(const RequestParams& params, 86 int Verify(const RequestParams& params,
87 net::CRLSet*, 87 net::CRLSet*,
88 net::CertVerifyResult* verify_result, 88 net::CertVerifyResult* verify_result,
89 const net::CompletionCallback&, 89 const net::CompletionCallback&,
90 std::unique_ptr<Request>*, 90 std::unique_ptr<Request>*,
91 const net::BoundNetLog&) override { 91 const net::NetLogWithSource&) override {
92 verify_result->Reset(); 92 verify_result->Reset();
93 verify_result->verified_cert = params.certificate(); 93 verify_result->verified_cert = params.certificate();
94 return net::OK; 94 return net::OK;
95 } 95 }
96 }; 96 };
97 97
98 } // namespace 98 } // namespace
99 99
100 CastSocket::CastSocket(const std::string& owner_extension_id) 100 CastSocket::CastSocket(const std::string& owner_extension_id)
101 : ApiResource(owner_extension_id) { 101 : ApiResource(owner_extension_id) {
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 VLOG_WITH_CONNECTION(1) << "SetErrorState " << error_state; 622 VLOG_WITH_CONNECTION(1) << "SetErrorState " << error_state;
623 DCHECK_EQ(CHANNEL_ERROR_NONE, error_state_); 623 DCHECK_EQ(CHANNEL_ERROR_NONE, error_state_);
624 error_state_ = error_state; 624 error_state_ = error_state;
625 logger_->LogSocketErrorState(channel_id_, ErrorStateToProto(error_state_)); 625 logger_->LogSocketErrorState(channel_id_, ErrorStateToProto(error_state_));
626 delegate_->OnError(error_state_); 626 delegate_->OnError(error_state_);
627 } 627 }
628 } // namespace cast_channel 628 } // namespace cast_channel
629 } // namespace api 629 } // namespace api
630 } // namespace extensions 630 } // namespace extensions
631 #undef VLOG_WITH_CONNECTION 631 #undef VLOG_WITH_CONNECTION
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698