summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-08-26 23:58:55 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-27 07:00:14 +0000
commit28af876b1acaac1c6aa51aeaf3e2cbb90403c474 (patch)
tree0d86adc2bf1e2ec90f1ce41c26e2a9fcf37127c8
parentaeddd327d27e99173c218bcef00422cd0d6cef30 (diff)
downloadchromium_src-28af876b1acaac1c6aa51aeaf3e2cbb90403c474.zip
chromium_src-28af876b1acaac1c6aa51aeaf3e2cbb90403c474.tar.gz
chromium_src-28af876b1acaac1c6aa51aeaf3e2cbb90403c474.tar.bz2
Remove implicit conversions from scoped_refptr to T* in content/browser/devtools/
This patch was generated by running the rewrite_scoped_refptr clang tool on a Linux build. BUG=110610 Review URL: https://codereview.chromium.org/502203002 Cr-Commit-Position: refs/heads/master@{#292112}
-rw-r--r--content/browser/devtools/devtools_browser_target.cc10
-rw-r--r--content/browser/devtools/devtools_http_handler_impl.cc10
-rw-r--r--content/browser/devtools/devtools_manager_unittest.cc4
-rw-r--r--content/browser/devtools/embedded_worker_devtools_manager_unittest.cc6
-rw-r--r--content/browser/devtools/render_view_devtools_agent_host.cc12
-rw-r--r--content/browser/devtools/renderer_overrides_handler.cc8
-rw-r--r--content/browser/devtools/tethering_handler.cc2
7 files changed, 26 insertions, 26 deletions
diff --git a/content/browser/devtools/devtools_browser_target.cc b/content/browser/devtools/devtools_browser_target.cc
index e959946..2fe1014 100644
--- a/content/browser/devtools/devtools_browser_target.cc
+++ b/content/browser/devtools/devtools_browser_target.cc
@@ -51,7 +51,7 @@ void DevToolsBrowserTarget::HandleMessage(const std::string& data) {
std::string error_response;
scoped_refptr<DevToolsProtocol::Command> command =
DevToolsProtocol::ParseCommand(data, &error_response);
- if (!command) {
+ if (!command.get()) {
Respond(error_response);
return;
}
@@ -80,9 +80,9 @@ void DevToolsBrowserTarget::HandleMessage(const std::string& data) {
if (handle_directly) {
scoped_refptr<DevToolsProtocol::Response> response =
handler->HandleCommand(command);
- if (response && response->is_async_promise())
+ if (response.get() && response->is_async_promise())
return;
- if (response)
+ if (response.get())
Respond(response->Serialize());
else
Respond(command->NoSuchMethodErrorResponse()->Serialize());
@@ -147,10 +147,10 @@ void DevToolsBrowserTarget::HandleCommandOnUIThread(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
scoped_refptr<DevToolsProtocol::Response> response =
handler->HandleCommand(command);
- if (response && response->is_async_promise())
+ if (response.get() && response->is_async_promise())
return;
- if (response)
+ if (response.get())
RespondFromUIThread(response->Serialize());
else
RespondFromUIThread(command->NoSuchMethodErrorResponse()->Serialize());
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index 18d30e3..954482e 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -87,7 +87,7 @@ class DevToolsAgentHostClientImpl : public DevToolsAgentHostClient {
}
virtual ~DevToolsAgentHostClientImpl() {
- if (agent_host_)
+ if (agent_host_.get())
agent_host_->DetachClient();
}
@@ -131,7 +131,7 @@ class DevToolsAgentHostClientImpl : public DevToolsAgentHostClient {
}
void OnMessage(const std::string& message) {
- if (agent_host_)
+ if (agent_host_.get())
agent_host_->DispatchProtocolMessage(message);
}
@@ -639,7 +639,7 @@ void DevToolsHttpHandlerImpl::OnWebSocketRequestUI(
DevToolsTarget* target = GetTarget(page_id);
scoped_refptr<DevToolsAgentHost> agent =
target ? target->GetAgentHost() : NULL;
- if (!agent) {
+ if (!agent.get()) {
Send500(connection_id, "No such target id: " + page_id);
return;
}
@@ -650,8 +650,8 @@ void DevToolsHttpHandlerImpl::OnWebSocketRequestUI(
return;
}
- DevToolsAgentHostClientImpl * client_host = new DevToolsAgentHostClientImpl(
- thread_->message_loop(), server_.get(), connection_id, agent);
+ DevToolsAgentHostClientImpl* client_host = new DevToolsAgentHostClientImpl(
+ thread_->message_loop(), server_.get(), connection_id, agent.get());
connection_to_client_ui_[connection_id] = client_host;
AcceptWebSocket(connection_id, request);
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 25a0ba4..b4984e6 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -175,7 +175,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
EXPECT_TRUE(contents()->cross_navigation_pending());
EXPECT_EQ(client_host.agent_host(),
- DevToolsAgentHost::GetOrCreateFor(web_contents()));
+ DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
// Interrupt pending navigation and navigate back to the original site.
controller().LoadURL(
@@ -184,7 +184,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED);
EXPECT_FALSE(contents()->cross_navigation_pending());
EXPECT_EQ(client_host.agent_host(),
- DevToolsAgentHost::GetOrCreateFor(web_contents()));
+ DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
client_host.Close();
}
diff --git a/content/browser/devtools/embedded_worker_devtools_manager_unittest.cc b/content/browser/devtools/embedded_worker_devtools_manager_unittest.cc
index 04107a3..2159fb4 100644
--- a/content/browser/devtools/embedded_worker_devtools_manager_unittest.cc
+++ b/content/browser/devtools/embedded_worker_devtools_manager_unittest.cc
@@ -28,10 +28,10 @@ class TestDevToolsClientHost : public DevToolsAgentHostClient {
DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {}
void InspectAgentHost(DevToolsAgentHost* agent_host) {
- if (agent_host_)
+ if (agent_host_.get())
agent_host_->DetachClient();
agent_host_ = agent_host;
- if (agent_host_)
+ if (agent_host_.get())
agent_host_->AttachClient(this);
}
private:
@@ -232,7 +232,7 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
EXPECT_NE(agent_host1.get(), agent_host2.get());
EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2));
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
- client_host2->InspectAgentHost(agent_host2);
+ client_host2->InspectAgentHost(agent_host2.get());
CheckWorkerState(2, 2, WorkerState::WORKER_INSPECTED);
manager_->WorkerDestroyed(2, 2);
CheckWorkerState(2, 2, WorkerState::WORKER_TERMINATED);
diff --git a/content/browser/devtools/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc
index 301b60d..12a05d5 100644
--- a/content/browser/devtools/render_view_devtools_agent_host.cc
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc
@@ -138,7 +138,7 @@ void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
scoped_refptr<DevToolsProtocol::Command> command =
DevToolsProtocol::ParseCommand(message_dict.get(), &error_message);
- if (command) {
+ if (command.get()) {
scoped_refptr<DevToolsProtocol::Response> overridden_response;
DevToolsManagerDelegate* delegate =
@@ -150,13 +150,13 @@ void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
overridden_response = DevToolsProtocol::ParseResponse(
overridden_response_value.get());
}
- if (!overridden_response)
+ if (!overridden_response.get())
overridden_response = overrides_handler_->HandleCommand(command);
- if (!overridden_response)
+ if (!overridden_response.get())
overridden_response = tracing_handler_->HandleCommand(command);
- if (!overridden_response)
+ if (!overridden_response.get())
overridden_response = power_handler_->HandleCommand(command);
- if (overridden_response) {
+ if (overridden_response.get()) {
if (!overridden_response->is_async_promise())
OnDispatchOnInspectorFrontend(overridden_response->Serialize());
return;
@@ -478,7 +478,7 @@ void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend(
scoped_refptr<DevToolsProtocol::Notification> notification =
DevToolsProtocol::ParseNotification(message);
- if (notification) {
+ if (notification.get()) {
tracing_handler_->HandleNotification(notification);
}
SendMessageToClient(message);
diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc
index 1a2fb120..f219fae 100644
--- a/content/browser/devtools/renderer_overrides_handler.cc
+++ b/content/browser/devtools/renderer_overrides_handler.cc
@@ -192,14 +192,14 @@ void RendererOverridesHandler::OnSwapCompositorFrame(
last_compositor_frame_metadata_ = frame_metadata;
has_last_compositor_frame_metadata_ = true;
- if (screencast_command_)
+ if (screencast_command_.get())
InnerSwapCompositorFrame();
if (color_picker_enabled_)
UpdateColorPickerFrame();
}
void RendererOverridesHandler::OnVisibilityChanged(bool visible) {
- if (!screencast_command_)
+ if (!screencast_command_.get())
return;
NotifyScreencastVisibility(visible);
}
@@ -1170,7 +1170,7 @@ void RendererOverridesHandler::UpdateColorPickerCursor() {
scoped_refptr<DevToolsProtocol::Response>
RendererOverridesHandler::InputEmulateTouchFromMouseEvent(
scoped_refptr<DevToolsProtocol::Command> command) {
- if (!screencast_command_)
+ if (!screencast_command_.get())
return command->InternalErrorResponse("Screencast should be turned on");
base::DictionaryValue* params = command->params();
@@ -1299,7 +1299,7 @@ RendererOverridesHandler::InputEmulateTouchFromMouseEvent(
void RendererOverridesHandler::UpdateTouchEventEmulationState() {
if (!host_)
return;
- bool enabled = touch_emulation_enabled_ || screencast_command_;
+ bool enabled = touch_emulation_enabled_ || screencast_command_.get();
host_->SetTouchEventEmulationEnabled(enabled);
WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
WebContents::FromRenderViewHost(host_));
diff --git a/content/browser/devtools/tethering_handler.cc b/content/browser/devtools/tethering_handler.cc
index 14949d1..a567797 100644
--- a/content/browser/devtools/tethering_handler.cc
+++ b/content/browser/devtools/tethering_handler.cc
@@ -150,7 +150,7 @@ class SocketPump : public net::StreamListenSocket::Delegate {
}
void SelfDestruct() {
- if (wire_buffer_ && wire_buffer_->offset() != wire_buffer_size_) {
+ if (wire_buffer_.get() && wire_buffer_->offset() != wire_buffer_size_) {
pending_destruction_ = true;
return;
}