Commit 52f7cef7 authored by dcheng's avatar dcheng Committed by Commit bot

Manual fixups for scoped_refptr operator T* removal in sync/

BUG=110610

Review URL: https://codereview.chromium.org/511173002

Cr-Commit-Position: refs/heads/master@{#292514}
parent 191dc409
......@@ -56,7 +56,7 @@ HttpBridge::RequestContextGetter::GetNetworkTaskRunner() const {
}
HttpBridgeFactory::HttpBridgeFactory(
net::URLRequestContextGetter* baseline_context_getter,
const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal)
: baseline_request_context_getter_(baseline_context_getter),
......
......@@ -16,10 +16,10 @@ namespace syncer {
HttpBridgeNetworkResources::~HttpBridgeNetworkResources() {}
scoped_ptr<HttpPostProviderFactory>
HttpBridgeNetworkResources::GetHttpPostProviderFactory(
net::URLRequestContextGetter* baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal) {
HttpBridgeNetworkResources::GetHttpPostProviderFactory(
const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal) {
return make_scoped_ptr<HttpPostProviderFactory>(
new HttpBridgeFactory(baseline_context_getter,
network_time_update_callback,
......
......@@ -228,7 +228,8 @@ class SYNC_EXPORT HttpBridgeFactory : public HttpPostProviderFactory,
public CancelationObserver {
public:
HttpBridgeFactory(
net::URLRequestContextGetter* baseline_context_getter,
const scoped_refptr<net::URLRequestContextGetter>&
baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal);
virtual ~HttpBridgeFactory();
......
......@@ -25,7 +25,8 @@ class SYNC_EXPORT HttpBridgeNetworkResources : public NetworkResources {
// NetworkResources
virtual scoped_ptr<HttpPostProviderFactory> GetHttpPostProviderFactory(
net::URLRequestContextGetter* baseline_context_getter,
const scoped_refptr<net::URLRequestContextGetter>&
baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal) OVERRIDE;
};
......
......@@ -23,7 +23,8 @@ class SYNC_EXPORT NetworkResources {
virtual ~NetworkResources() {}
virtual scoped_ptr<HttpPostProviderFactory> GetHttpPostProviderFactory(
net::URLRequestContextGetter* baseline_context_getter,
const scoped_refptr<net::URLRequestContextGetter>&
baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal) = 0;
};
......
......@@ -24,10 +24,10 @@ FakeServerNetworkResources::FakeServerNetworkResources(FakeServer* fake_server)
FakeServerNetworkResources::~FakeServerNetworkResources() {}
scoped_ptr<syncer::HttpPostProviderFactory>
FakeServerNetworkResources::GetHttpPostProviderFactory(
net::URLRequestContextGetter* baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal) {
FakeServerNetworkResources::GetHttpPostProviderFactory(
const scoped_refptr<net::URLRequestContextGetter>& baseline_context_getter,
const NetworkTimeUpdateCallback& network_time_update_callback,
CancelationSignal* cancelation_signal) {
return make_scoped_ptr<syncer::HttpPostProviderFactory>(
new FakeServerHttpPostProviderFactory(
fake_server_,
......
......@@ -24,11 +24,12 @@ class FakeServerNetworkResources : public syncer::NetworkResources {
virtual ~FakeServerNetworkResources();
// NetworkResources
virtual
scoped_ptr<syncer::HttpPostProviderFactory> GetHttpPostProviderFactory(
net::URLRequestContextGetter* baseline_context_getter,
const syncer::NetworkTimeUpdateCallback& network_time_update_callback,
syncer::CancelationSignal* cancelation_signal) OVERRIDE;
virtual scoped_ptr<syncer::HttpPostProviderFactory>
GetHttpPostProviderFactory(
const scoped_refptr<net::URLRequestContextGetter>&
baseline_context_getter,
const syncer::NetworkTimeUpdateCallback& network_time_update_callback,
syncer::CancelationSignal* cancelation_signal) OVERRIDE;
private:
FakeServer* const fake_server_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment