Commit 80638a0b authored by lazyboy@chromium.org's avatar lazyboy@chromium.org

Cleanup: Remove unnecessary .get() in test's scoped_ptr-s.

BUG=None
Test=None, internal test only change.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266678 0039d316-1c4b-4281-b951-d872f2087c98
parent 63cf86df
...@@ -104,7 +104,7 @@ class TestBrowserPluginHostFactory : public BrowserPluginHostFactory { ...@@ -104,7 +104,7 @@ class TestBrowserPluginHostFactory : public BrowserPluginHostFactory {
virtual BrowserPluginGuestManager* virtual BrowserPluginGuestManager*
CreateBrowserPluginGuestManager() OVERRIDE { CreateBrowserPluginGuestManager() OVERRIDE {
guest_manager_instance_count_++; guest_manager_instance_count_++;
if (message_loop_runner_.get()) if (message_loop_runner_)
message_loop_runner_->Quit(); message_loop_runner_->Quit();
return new TestBrowserPluginGuestManager(); return new TestBrowserPluginGuestManager();
} }
...@@ -207,7 +207,7 @@ class MessageObserver : public WebContentsObserver { ...@@ -207,7 +207,7 @@ class MessageObserver : public WebContentsObserver {
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
if (message.type() == message_id_) { if (message.type() == message_id_) {
message_received_ = true; message_received_ = true;
if (message_loop_runner_.get()) if (message_loop_runner_)
message_loop_runner_->Quit(); message_loop_runner_->Quit();
} }
return false; return false;
......
...@@ -48,10 +48,10 @@ void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) { ...@@ -48,10 +48,10 @@ void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
last_view_size_observed_ = params.view_size; last_view_size_observed_ = params.view_size;
if (!expected_auto_view_size_.IsEmpty() && if (!expected_auto_view_size_.IsEmpty() &&
expected_auto_view_size_ == params.view_size) { expected_auto_view_size_ == params.view_size) {
if (auto_view_size_message_loop_runner_.get()) if (auto_view_size_message_loop_runner_)
auto_view_size_message_loop_runner_->Quit(); auto_view_size_message_loop_runner_->Quit();
} }
if (send_message_loop_runner_.get()) if (send_message_loop_runner_)
send_message_loop_runner_->Quit(); send_message_loop_runner_->Quit();
} }
BrowserPluginGuest::SendMessageToEmbedder(msg); BrowserPluginGuest::SendMessageToEmbedder(msg);
...@@ -85,7 +85,7 @@ void TestBrowserPluginGuest::RenderProcessGone(base::TerminationStatus status) { ...@@ -85,7 +85,7 @@ void TestBrowserPluginGuest::RenderProcessGone(base::TerminationStatus status) {
if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION && if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION &&
status != base::TERMINATION_STATUS_STILL_RUNNING) status != base::TERMINATION_STATUS_STILL_RUNNING)
VLOG(0) << "Guest crashed status: " << status; VLOG(0) << "Guest crashed status: " << status;
if (crash_message_loop_runner_.get()) if (crash_message_loop_runner_)
crash_message_loop_runner_->Quit(); crash_message_loop_runner_->Quit();
BrowserPluginGuest::RenderProcessGone(status); BrowserPluginGuest::RenderProcessGone(status);
} }
...@@ -98,7 +98,7 @@ void TestBrowserPluginGuest::OnHandleInputEvent( ...@@ -98,7 +98,7 @@ void TestBrowserPluginGuest::OnHandleInputEvent(
guest_window_rect, guest_window_rect,
event); event);
input_observed_ = true; input_observed_ = true;
if (input_message_loop_runner_.get()) if (input_message_loop_runner_)
input_message_loop_runner_->Quit(); input_message_loop_runner_->Quit();
} }
...@@ -196,11 +196,11 @@ void TestBrowserPluginGuest::WaitForImeCancel() { ...@@ -196,11 +196,11 @@ void TestBrowserPluginGuest::WaitForImeCancel() {
void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) { void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
if (focused) { if (focused) {
focus_observed_ = true; focus_observed_ = true;
if (focus_message_loop_runner_.get()) if (focus_message_loop_runner_)
focus_message_loop_runner_->Quit(); focus_message_loop_runner_->Quit();
} else { } else {
blur_observed_ = true; blur_observed_ = true;
if (blur_message_loop_runner_.get()) if (blur_message_loop_runner_)
blur_message_loop_runner_->Quit(); blur_message_loop_runner_->Quit();
} }
BrowserPluginGuest::OnSetFocus(instance_id, focused); BrowserPluginGuest::OnSetFocus(instance_id, focused);
...@@ -208,7 +208,7 @@ void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) { ...@@ -208,7 +208,7 @@ void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
void TestBrowserPluginGuest::OnTakeFocus(bool reverse) { void TestBrowserPluginGuest::OnTakeFocus(bool reverse) {
advance_focus_observed_ = true; advance_focus_observed_ = true;
if (advance_focus_message_loop_runner_.get()) if (advance_focus_message_loop_runner_)
advance_focus_message_loop_runner_->Quit(); advance_focus_message_loop_runner_->Quit();
BrowserPluginGuest::OnTakeFocus(reverse); BrowserPluginGuest::OnTakeFocus(reverse);
} }
...@@ -220,7 +220,7 @@ void TestBrowserPluginGuest::SetDamageBuffer( ...@@ -220,7 +220,7 @@ void TestBrowserPluginGuest::SetDamageBuffer(
if (waiting_for_damage_buffer_with_size_ && if (waiting_for_damage_buffer_with_size_ &&
expected_damage_buffer_size_ == params.view_rect.size() && expected_damage_buffer_size_ == params.view_rect.size() &&
damage_buffer_message_loop_runner_.get()) { damage_buffer_message_loop_runner_) {
damage_buffer_message_loop_runner_->Quit(); damage_buffer_message_loop_runner_->Quit();
waiting_for_damage_buffer_with_size_ = false; waiting_for_damage_buffer_with_size_ = false;
} }
...@@ -232,14 +232,14 @@ void TestBrowserPluginGuest::DidStopLoading( ...@@ -232,14 +232,14 @@ void TestBrowserPluginGuest::DidStopLoading(
RenderViewHost* render_view_host) { RenderViewHost* render_view_host) {
BrowserPluginGuest::DidStopLoading(render_view_host); BrowserPluginGuest::DidStopLoading(render_view_host);
load_stop_observed_ = true; load_stop_observed_ = true;
if (load_stop_message_loop_runner_.get()) if (load_stop_message_loop_runner_)
load_stop_message_loop_runner_->Quit(); load_stop_message_loop_runner_->Quit();
} }
void TestBrowserPluginGuest::OnImeCancelComposition() { void TestBrowserPluginGuest::OnImeCancelComposition() {
if (!ime_cancel_observed_) { if (!ime_cancel_observed_) {
ime_cancel_observed_ = true; ime_cancel_observed_ = true;
if (ime_cancel_message_loop_runner_.get()) if (ime_cancel_message_loop_runner_)
ime_cancel_message_loop_runner_->Quit(); ime_cancel_message_loop_runner_->Quit();
} }
BrowserPluginGuest::OnImeCancelComposition(); BrowserPluginGuest::OnImeCancelComposition();
...@@ -247,7 +247,7 @@ void TestBrowserPluginGuest::OnImeCancelComposition() { ...@@ -247,7 +247,7 @@ void TestBrowserPluginGuest::OnImeCancelComposition() {
void TestBrowserPluginGuest::WasHidden() { void TestBrowserPluginGuest::WasHidden() {
was_hidden_observed_ = true; was_hidden_observed_ = true;
if (was_hidden_message_loop_runner_.get()) if (was_hidden_message_loop_runner_)
was_hidden_message_loop_runner_->Quit(); was_hidden_message_loop_runner_->Quit();
} }
......
...@@ -19,7 +19,7 @@ void TestBrowserPluginGuestManager::AddGuest( ...@@ -19,7 +19,7 @@ void TestBrowserPluginGuestManager::AddGuest(
int instance_id, int instance_id,
WebContentsImpl* guest_web_contents) { WebContentsImpl* guest_web_contents) {
BrowserPluginGuestManager::AddGuest(instance_id, guest_web_contents); BrowserPluginGuestManager::AddGuest(instance_id, guest_web_contents);
if (message_loop_runner_.get()) if (message_loop_runner_)
message_loop_runner_->Quit(); message_loop_runner_->Quit();
} }
......
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