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

Unified Diff: components/grpc_support/cronet_c_for_grpc.cc

Issue 2273403003: Moving gRPC support interfaces out of cronet and into a new component. (Closed)
Patch Set: Add cronet_c_for_graph back to sources. Might fix GN, probably won't compile Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: components/grpc_support/cronet_c_for_grpc.cc
diff --git a/components/cronet/ios/cronet_c_for_grpc.cc b/components/grpc_support/cronet_c_for_grpc.cc
similarity index 91%
rename from components/cronet/ios/cronet_c_for_grpc.cc
rename to components/grpc_support/cronet_c_for_grpc.cc
index 5c7810a9fcd554ec57daf615111a17c0041b87e0..e95b65526e462c3e6422eb05ca55262b9cad1eeb 100644
--- a/components/cronet/ios/cronet_c_for_grpc.cc
+++ b/components/grpc_support/cronet_c_for_grpc.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/cronet/ios/cronet_c_for_grpc.h"
+#include "components/grpc_support/cronet_c_for_grpc.h"
#include <stdbool.h>
@@ -17,8 +17,8 @@
#include "base/memory/ref_counted.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
-#include "components/cronet/ios/cronet_bidirectional_stream.h"
-#include "components/cronet/ios/cronet_environment.h"
+#include "components/grpc_support/cronet_bidirectional_stream.h"
+#include "components/grpc_support/environment.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/request_priority.h"
@@ -69,7 +69,7 @@ HeadersArray::~HeadersArray() {
}
class CronetBidirectionalStreamAdapter
- : public cronet::CronetBidirectionalStream::Delegate {
+ : public grpc_support::CronetBidirectionalStream::Delegate {
public:
CronetBidirectionalStreamAdapter(
cronet_engine* engine,
@@ -95,7 +95,7 @@ class CronetBidirectionalStreamAdapter
void OnCanceled() override;
- static cronet::CronetBidirectionalStream* GetCronetStream(
+ static grpc_support::CronetBidirectionalStream* GetCronetStream(
cronet_bidirectional_stream* stream);
static void DestroyAdapterForStream(cronet_bidirectional_stream* stream);
@@ -104,8 +104,8 @@ class CronetBidirectionalStreamAdapter
void DestroyOnNetworkThread();
// None of these objects are owned by |this|.
- cronet::CronetEnvironment* cronet_environment_;
- cronet::CronetBidirectionalStream* cronet_bidirectional_stream_;
+ grpc_support::Environment* environment_;
+ grpc_support::CronetBidirectionalStream* cronet_bidirectional_stream_;
// C side
cronet_bidirectional_stream* stream_;
cronet_bidirectional_stream_callback* callback_;
@@ -115,13 +115,13 @@ CronetBidirectionalStreamAdapter::CronetBidirectionalStreamAdapter(
cronet_engine* engine,
cronet_bidirectional_stream* stream,
cronet_bidirectional_stream_callback* callback)
- : cronet_environment_(
- reinterpret_cast<cronet::CronetEnvironment*>(engine->obj)),
+ : environment_(
+ reinterpret_cast<grpc_support::Environment*>(engine->obj)),
stream_(stream),
callback_(callback) {
- DCHECK(cronet_environment_);
+ DCHECK(environment_);
cronet_bidirectional_stream_ =
- new cronet::CronetBidirectionalStream(cronet_environment_, this);
+ new grpc_support::CronetBidirectionalStream(environment_, this);
}
CronetBidirectionalStreamAdapter::~CronetBidirectionalStreamAdapter() {}
@@ -172,7 +172,7 @@ void CronetBidirectionalStreamAdapter::OnCanceled() {
callback_->on_canceled(stream_);
}
-cronet::CronetBidirectionalStream*
+grpc_support::CronetBidirectionalStream*
CronetBidirectionalStreamAdapter::GetCronetStream(
cronet_bidirectional_stream* stream) {
DCHECK(stream);
@@ -193,14 +193,14 @@ void CronetBidirectionalStreamAdapter::DestroyAdapterForStream(
// posting task to executor throws an exception), but is posted, so |this|
// is valid until calling task is complete.
adapter->cronet_bidirectional_stream_->Destroy();
- adapter->cronet_environment_->PostToNetworkThread(
+ adapter->environment_->PostToNetworkThread(
FROM_HERE,
base::Bind(&CronetBidirectionalStreamAdapter::DestroyOnNetworkThread,
base::Unretained(adapter)));
}
void CronetBidirectionalStreamAdapter::DestroyOnNetworkThread() {
- DCHECK(cronet_environment_->IsOnNetworkThread());
+ DCHECK(environment_->IsOnNetworkThread());
delete this;
}
@@ -245,7 +245,7 @@ int cronet_bidirectional_stream_start(
const char* method,
const cronet_bidirectional_stream_header_array* headers,
bool end_of_stream) {
- cronet::CronetBidirectionalStream* cronet_stream =
+ grpc_support::CronetBidirectionalStream* cronet_stream =
CronetBidirectionalStreamAdapter::GetCronetStream(stream);
net::HttpRequestHeaders request_headers;
if (headers) {

Powered by Google App Engine
This is Rietveld 408576698