Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 226140f

Browse files
qwu16qwu16
committed
Align naming rules with Chromium
1 parent 2ee752d commit 226140f

15 files changed

+224
-224
lines changed

‎quic_transport/sdk/impl/quic_transport_factory_impl.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ owt::quic::QuicTransportServerInterface* QuicTransportFactoryImpl::CreateQuicTra
171171
net::IPAddress ip = net::IPAddress::IPv6AllZeros();
172172
::quic::QuicConfig config;
173173

174-
*result = new net::QuicTransportOWTServerImpl(
174+
*result = new net::QuicTransportOwtServerImpl(
175175
port, std::move(proof_source), config,
176176
::quic::QuicCryptoServerConfig::ConfigOptions(),
177177
::quic::AllSupportedVersions(),
@@ -233,7 +233,7 @@ QuicTransportFactoryImpl::CreateQuicTransportClient(
233233
net::PRIVACY_MODE_DISABLED);
234234
::quic::ParsedQuicVersionVector versions = ::quic::CurrentSupportedVersions();
235235

236-
*result = new net::QuicTransportOWTClientImpl(
236+
*result = new net::QuicTransportOwtClientImpl(
237237
::quic::QuicSocketAddress(ip_addr, port), server_id, versions, std::move(proof_verifier),
238238
io_thread, event_thread);
239239
event->Signal();

‎quic_transport/sdk/impl/quic_transport_owt_client_base.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ using std::string;
1313

1414
namespace quic {
1515

16-
QuicTransportOWTClientBase::QuicTransportOWTClientBase(
16+
QuicTransportOwtClientBase::QuicTransportOwtClientBase(
1717
const QuicServerId& server_id,
1818
const ParsedQuicVersionVector& supported_versions,
1919
const QuicConfig& config,
@@ -35,46 +35,46 @@ QuicTransportOWTClientBase::QuicTransportOWTClientBase(
3535
task_runner_(io_runner),
3636
event_runner_(event_runner) {}
3737

38-
QuicTransportOWTClientBase::~QuicTransportOWTClientBase() {
38+
QuicTransportOwtClientBase::~QuicTransportOwtClientBase() {
3939
// If we own something. We need to explicitly kill
4040
// the session before something goes out of scope.
4141
ResetSession();
4242
}
4343

44-
QuicTransportOWTClientSession* QuicTransportOWTClientBase::client_session() {
45-
return static_cast<QuicTransportOWTClientSession*>(QuicClientBase::session());
44+
QuicTransportOwtClientSession* QuicTransportOwtClientBase::client_session() {
45+
return static_cast<QuicTransportOwtClientSession*>(QuicClientBase::session());
4646
}
4747

48-
void QuicTransportOWTClientBase::InitializeSession() {
48+
void QuicTransportOwtClientBase::InitializeSession() {
4949
client_session()->Initialize();
5050
client_session()->CryptoConnect();
5151
}
5252

53-
std::unique_ptr<QuicSession> QuicTransportOWTClientBase::CreateQuicClientSession(
53+
std::unique_ptr<QuicSession> QuicTransportOwtClientBase::CreateQuicClientSession(
5454
const quic::ParsedQuicVersionVector& supported_versions,
5555
QuicConnection* connection) {
56-
return std::make_unique<QuicTransportOWTClientSession>(
56+
return std::make_unique<QuicTransportOwtClientSession>(
5757
connection, nullptr, *config(), supported_versions, server_id(),
5858
crypto_config(), task_runner_, event_runner_);
5959
}
6060

61-
bool QuicTransportOWTClientBase::EarlyDataAccepted() {
61+
bool QuicTransportOwtClientBase::EarlyDataAccepted() {
6262
return client_session()->EarlyDataAccepted();
6363
}
6464

65-
bool QuicTransportOWTClientBase::ReceivedInchoateReject() {
65+
bool QuicTransportOwtClientBase::ReceivedInchoateReject() {
6666
return client_session()->ReceivedInchoateReject();
6767
}
6868

69-
int QuicTransportOWTClientBase::GetNumSentClientHellosFromSession() {
69+
int QuicTransportOwtClientBase::GetNumSentClientHellosFromSession() {
7070
return client_session()->GetNumSentClientHellos();
7171
}
7272

73-
int QuicTransportOWTClientBase::GetNumReceivedServerConfigUpdatesFromSession() {
73+
int QuicTransportOwtClientBase::GetNumReceivedServerConfigUpdatesFromSession() {
7474
return client_session()->GetNumReceivedServerConfigUpdates();
7575
}
7676

77-
bool QuicTransportOWTClientBase::HasActiveRequests() {
77+
bool QuicTransportOwtClientBase::HasActiveRequests() {
7878
return client_session()->HasActiveRequestStreams();
7979
}
8080

‎quic_transport/sdk/impl/quic_transport_owt_client_base.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ namespace quic {
2323
class ProofVerifier;
2424
class QuicServerId;
2525

26-
class QuicTransportOWTClientBase : public QuicClientBase {
26+
class QuicTransportOwtClientBase : public QuicClientBase {
2727
public:
28-
QuicTransportOWTClientBase(const QuicServerId& server_id,
28+
QuicTransportOwtClientBase(const QuicServerId& server_id,
2929
const ParsedQuicVersionVector& supported_versions,
3030
const QuicConfig& config,
3131
QuicConnectionHelperInterface* helper,
@@ -35,10 +35,10 @@ class QuicTransportOWTClientBase : public QuicClientBase {
3535
std::unique_ptr<SessionCache> session_cache,
3636
base::SingleThreadTaskRunner* io_runner,
3737
base::SingleThreadTaskRunner* event_runner);
38-
QuicTransportOWTClientBase(const QuicTransportOWTClientBase&) = delete;
39-
QuicTransportOWTClientBase& operator=(const QuicTransportOWTClientBase&) = delete;
38+
QuicTransportOwtClientBase(const QuicTransportOwtClientBase&) = delete;
39+
QuicTransportOwtClientBase& operator=(const QuicTransportOwtClientBase&) = delete;
4040

41-
~QuicTransportOWTClientBase() override;
41+
~QuicTransportOwtClientBase() override;
4242

4343
// QuicClientBase
4444
void ResendSavedData() override {}
@@ -51,7 +51,7 @@ class QuicTransportOWTClientBase : public QuicClientBase {
5151

5252
// Returns a the session used for this client downcasted to a
5353
// QuicRawClientSession.
54-
QuicTransportOWTClientSession* client_session();
54+
QuicTransportOwtClientSession* client_session();
5555

5656
protected:
5757
int GetNumSentClientHellosFromSession() override;

‎quic_transport/sdk/impl/quic_transport_owt_client_impl.cc‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ using std::string;
3535

3636
namespace net {
3737

38-
QuicTransportOWTClientImpl::QuicTransportOWTClientImpl(
38+
QuicTransportOwtClientImpl::QuicTransportOwtClientImpl(
3939
quic::QuicSocketAddress server_address,
4040
const quic::QuicServerId& server_id,
4141
const quic::ParsedQuicVersionVector& supported_versions,
4242
std::unique_ptr<quic::ProofVerifier> proof_verifier,
4343
base::Thread* io_thread,
4444
base::Thread* event_thread)
45-
: quic::QuicTransportOWTClientBase(
45+
: quic::QuicTransportOwtClientBase(
4646
server_id,
4747
supported_versions,
4848
quic::QuicConfig(),
@@ -69,32 +69,32 @@ QuicTransportOWTClientImpl::QuicTransportOWTClientImpl(
6969
set_server_address(server_address);
7070
}
7171

72-
QuicTransportOWTClientImpl::~QuicTransportOWTClientImpl() {
72+
QuicTransportOwtClientImpl::~QuicTransportOwtClientImpl() {
7373
if (connected()) {
7474
session()->connection()->CloseConnection(
7575
quic::QUIC_PEER_GOING_AWAY, "Shutting down",
7676
quic::ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
7777
}
7878
}
7979

80-
QuicChromiumConnectionHelper* QuicTransportOWTClientImpl::CreateQuicConnectionHelper() {
80+
QuicChromiumConnectionHelper* QuicTransportOwtClientImpl::CreateQuicConnectionHelper() {
8181
return new QuicChromiumConnectionHelper(&clock_,
8282
quic::QuicRandom::GetInstance());
8383
}
8484

85-
QuicClientMessageLooplNetworkHelper* QuicTransportOWTClientImpl::CreateNetworkHelper() {
85+
QuicClientMessageLooplNetworkHelper* QuicTransportOwtClientImpl::CreateNetworkHelper() {
8686
created_helper_ = new QuicClientMessageLooplNetworkHelper(&clock_, this);
8787
return created_helper_;
8888
}
8989

90-
void QuicTransportOWTClientImpl::Start() {
90+
void QuicTransportOwtClientImpl::Start() {
9191
task_runner_->PostTask(
9292
FROM_HERE,
93-
base::BindOnce(&QuicTransportOWTClientImpl::StartOnCurrentThread, weak_factory_.GetWeakPtr()));
93+
base::BindOnce(&QuicTransportOwtClientImpl::StartOnCurrentThread, weak_factory_.GetWeakPtr()));
9494
return ;
9595
}
9696

97-
void QuicTransportOWTClientImpl::StartOnCurrentThread() {
97+
void QuicTransportOwtClientImpl::StartOnCurrentThread() {
9898
if (!Initialize()) {
9999
std::cerr << "Failed to initialize client." << std::endl;
100100
if(visitor_) {
@@ -119,56 +119,56 @@ void QuicTransportOWTClientImpl::StartOnCurrentThread() {
119119
std::cerr << "client connect to quic server succeed in thread:" << base::PlatformThread::CurrentId() << std::endl;
120120
}
121121

122-
void QuicTransportOWTClientImpl::Stop() {
122+
void QuicTransportOwtClientImpl::Stop() {
123123
task_runner_->PostTask(
124124
FROM_HERE,
125-
base::BindOnce(&QuicTransportOWTClientImpl::StopOnCurrentThread, weak_factory_.GetWeakPtr()));
125+
base::BindOnce(&QuicTransportOwtClientImpl::StopOnCurrentThread, weak_factory_.GetWeakPtr()));
126126
return ;
127127
}
128128

129-
void QuicTransportOWTClientImpl::StopOnCurrentThread() {
129+
void QuicTransportOwtClientImpl::StopOnCurrentThread() {
130130
Disconnect();
131131
}
132132

133-
int QuicTransportOWTClientImpl::SocketPort() {
133+
int QuicTransportOwtClientImpl::SocketPort() {
134134
return created_helper_->GetLatestClientAddress().port();
135135
}
136136

137-
void QuicTransportOWTClientImpl::SetVisitor(owt::quic::QuicTransportClientInterface::Visitor* visitor) {
137+
void QuicTransportOwtClientImpl::SetVisitor(owt::quic::QuicTransportClientInterface::Visitor* visitor) {
138138
visitor_ = visitor;
139139
}
140140

141-
void QuicTransportOWTClientImpl::OnConnectionClosed(char* id, size_t len) {
141+
void QuicTransportOwtClientImpl::OnConnectionClosed(char* id, size_t len) {
142142
if(visitor_) {
143143
visitor_->OnConnectionClosed(id, len);
144144
}
145145
}
146146

147-
void QuicTransportOWTClientImpl::NewStreamCreated(quic::QuicTransportOWTStreamImpl* stream) {
147+
void QuicTransportOwtClientImpl::NewStreamCreated(quic::QuicTransportOwtStreamImpl* stream) {
148148
if(visitor_) {
149149
visitor_->OnIncomingStream(stream);
150150
}
151151
}
152152

153-
void QuicTransportOWTClientImpl::OnIncomingNewStream(quic::QuicTransportOWTStreamImpl* stream) {
153+
void QuicTransportOwtClientImpl::OnIncomingNewStream(quic::QuicTransportOwtStreamImpl* stream) {
154154
event_runner_->PostTask(
155155
FROM_HERE,
156156
base::BindOnce(
157-
[](QuicTransportOWTClientImpl* client,
158-
quic::QuicTransportOWTStreamImpl* stream) {
157+
[](QuicTransportOwtClientImpl* client,
158+
quic::QuicTransportOwtStreamImpl* stream) {
159159
client->NewStreamCreated(stream);
160160
},
161161
base::Unretained(this), base::Unretained(stream)));
162162
}
163163

164-
void QuicTransportOWTClientImpl::OnStreamClosed(uint32_t id) {
164+
void QuicTransportOwtClientImpl::OnStreamClosed(uint32_t id) {
165165
if(visitor_) {
166166
visitor_->OnStreamClosed(id);
167167
}
168168
}
169169

170-
const char* QuicTransportOWTClientImpl::Id() {
171-
std::cerr << "QuicTransportOWTClientImpl Get client session id:" << client_session()->connection()->connection_id().ToString();
170+
const char* QuicTransportOwtClientImpl::Id() {
171+
std::cerr << "QuicTransportOwtClientImpl Get client session id:" << client_session()->connection()->connection_id().ToString();
172172
const std::string& session_id_str =
173173
client_session()->connection()->connection_id().ToString();
174174
char* id = new char[session_id_str.size() + 1];
@@ -178,30 +178,30 @@ const char* QuicTransportOWTClientImpl::Id() {
178178

179179
}
180180

181-
void QuicTransportOWTClientImpl::CloseStreamOnCurrentThread(uint32_t id) {
182-
printf("QuicTransportOWTClientImpl::CloseStreamOnCurrentThread close stream:%d\n", id);
181+
void QuicTransportOwtClientImpl::CloseStreamOnCurrentThread(uint32_t id) {
182+
printf("QuicTransportOwtClientImpl::CloseStreamOnCurrentThread close stream:%d\n", id);
183183
session_->ResetStream(id, quic::QUIC_STREAM_CANCELLED);
184184
}
185185

186-
void QuicTransportOWTClientImpl::CloseStream(uint32_t id) {
186+
void QuicTransportOwtClientImpl::CloseStream(uint32_t id) {
187187
event_runner_->PostTask(
188188
FROM_HERE,
189-
base::BindOnce(&QuicTransportOWTClientImpl::CloseStreamOnCurrentThread, base::Unretained(this), id));
189+
base::BindOnce(&QuicTransportOwtClientImpl::CloseStreamOnCurrentThread, base::Unretained(this), id));
190190
}
191191

192-
uint8_t QuicTransportOWTClientImpl::length() {
192+
uint8_t QuicTransportOwtClientImpl::length() {
193193
return client_session()->connection()->client_connection_id().length();
194194
}
195195

196-
owt::quic::QuicTransportStreamInterface* QuicTransportOWTClientImpl::CreateBidirectionalStream() {
197-
std::cerr << "QuicTransportOWTClientImpl::CreateBidirectionalStream" << std::endl;
196+
owt::quic::QuicTransportStreamInterface* QuicTransportOwtClientImpl::CreateBidirectionalStream() {
197+
std::cerr << "QuicTransportOwtClientImpl::CreateBidirectionalStream" << std::endl;
198198
owt::quic::QuicTransportStreamInterface* result(nullptr);
199199
base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
200200
base::WaitableEvent::InitialState::NOT_SIGNALED);
201201
event_runner_->PostTask(
202202
FROM_HERE,
203203
base::BindOnce(
204-
[](QuicTransportOWTClientImpl* client,
204+
[](QuicTransportOwtClientImpl* client,
205205
owt::quic::QuicTransportStreamInterface** result, base::WaitableEvent* event) {
206206
*result = client->CreateBidirectionalStreamOnCurrentThread();
207207
event->Signal();
@@ -212,20 +212,20 @@ owt::quic::QuicTransportStreamInterface* QuicTransportOWTClientImpl::CreateBidir
212212
return result;
213213
}
214214

215-
owt::quic::QuicTransportStreamInterface* QuicTransportOWTClientImpl::CreateBidirectionalStreamOnCurrentThread() {
216-
std::cerr << "QuicTransportOWTClientImpl::CreateBidirectionalStreamOnCurrentThread" << std::endl;
215+
owt::quic::QuicTransportStreamInterface* QuicTransportOwtClientImpl::CreateBidirectionalStreamOnCurrentThread() {
216+
std::cerr << "QuicTransportOwtClientImpl::CreateBidirectionalStreamOnCurrentThread" << std::endl;
217217
if (!connected()) {
218218
return nullptr;
219219
}
220220

221221
auto* stream = static_cast<owt::quic::QuicTransportStreamInterface*>(
222222
client_session()->CreateOutgoingBidirectionalStream());
223223

224-
std::cerr << "QuicTransportOWTClientImpl::CreateBidirectionalStreamOnCurrentThread succeed" << std::endl;
224+
std::cerr << "QuicTransportOwtClientImpl::CreateBidirectionalStreamOnCurrentThread succeed" << std::endl;
225225
return stream;
226226
}
227227

228-
QuicChromiumAlarmFactory* QuicTransportOWTClientImpl::CreateQuicAlarmFactory() {
228+
QuicChromiumAlarmFactory* QuicTransportOwtClientImpl::CreateQuicAlarmFactory() {
229229
return new QuicChromiumAlarmFactory(base::ThreadTaskRunnerHandle::Get().get(),
230230
&clock_);
231231
}

‎quic_transport/sdk/impl/quic_transport_owt_client_impl.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,28 @@ namespace net {
3131
class QuicChromiumAlarmFactory;
3232
class QuicChromiumConnectionHelper;
3333

34-
class QuicTransportOWTClientImpl : public quic::QuicTransportOWTClientBase,
35-
public quic::QuicTransportOWTClientSession::Visitor,
34+
class QuicTransportOwtClientImpl : public quic::QuicTransportOwtClientBase,
35+
public quic::QuicTransportOwtClientSession::Visitor,
3636
public owt::quic::QuicTransportClientInterface {
3737
public:
3838

3939
// Create a quic client, which will have events managed by the message loop.
40-
QuicTransportOWTClientImpl(quic::QuicSocketAddress server_address,
40+
QuicTransportOwtClientImpl(quic::QuicSocketAddress server_address,
4141
const quic::QuicServerId& server_id,
4242
const quic::ParsedQuicVersionVector& supported_versions,
4343
std::unique_ptr<quic::ProofVerifier> proof_verifier,
4444
base::Thread* io_thread,
4545
base::Thread* event_thread);
4646

47-
~QuicTransportOWTClientImpl() override;
47+
~QuicTransportOwtClientImpl() override;
4848

4949
int SocketPort();
5050
void Start() override;
5151
void Stop() override;
5252
void SetVisitor(owt::quic::QuicTransportClientInterface::Visitor* visitor) override;
5353
owt::quic::QuicTransportStreamInterface* CreateBidirectionalStream() override;
5454
void OnConnectionClosed(char*, size_t len) override;
55-
void OnIncomingNewStream(quic::QuicTransportOWTStreamImpl* stream) override;
55+
void OnIncomingNewStream(quic::QuicTransportOwtStreamImpl* stream) override;
5656
void OnStreamClosed(uint32_t id) override;
5757
const char* Id() override;
5858
uint8_t length() override;
@@ -66,7 +66,7 @@ class QuicTransportOWTClientImpl : public quic::QuicTransportOWTClientBase,
6666
void StartOnCurrentThread();
6767
void StopOnCurrentThread();
6868
void CloseStreamOnCurrentThread(uint32_t id);
69-
void NewStreamCreated(quic::QuicTransportOWTStreamImpl* stream);
69+
void NewStreamCreated(quic::QuicTransportOwtStreamImpl* stream);
7070

7171
owt::quic::QuicTransportStreamInterface* CreateBidirectionalStreamOnCurrentThread();
7272
// Used by |helper_| to time alarms.
@@ -78,11 +78,11 @@ class QuicTransportOWTClientImpl : public quic::QuicTransportOWTClientBase,
7878
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
7979
scoped_refptr<base::SingleThreadTaskRunner> event_runner_;
8080
QuicTransportClientInterface::Visitor* visitor_;
81-
quic::QuicTransportOWTClientSession* session_;
81+
quic::QuicTransportOwtClientSession* session_;
8282

83-
base::WeakPtrFactory<QuicTransportOWTClientImpl> weak_factory_;
83+
base::WeakPtrFactory<QuicTransportOwtClientImpl> weak_factory_;
8484

85-
//DISALLOW_COPY_AND_ASSIGN(QuicTransportOWTClientImpl);
85+
//DISALLOW_COPY_AND_ASSIGN(QuicTransportOwtClientImpl);
8686
};
8787

8888
} // namespace net

0 commit comments

Comments
 (0)