summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 14:27:23 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 14:27:23 +0000
commit2033fb861781de480cacc9c0bfb7998d7fa828e5 (patch)
tree94fd8f829e55ca7c02bd5761e51db5187d9468ad /webkit/tools
parent7521b65a904d1a21f85e6d28501e83ee27d6a3fc (diff)
downloadchromium_src-2033fb861781de480cacc9c0bfb7998d7fa828e5.zip
chromium_src-2033fb861781de480cacc9c0bfb7998d7fa828e5.tar.gz
chromium_src-2033fb861781de480cacc9c0bfb7998d7fa828e5.tar.bz2
Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.
In r174057, enne@ added support for implicit testing to scoped_ptr<>. Removes these in webkit/. BUG=232084 Review URL: https://chromiumcodereview.appspot.com/14886011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_dom_storage_system.cc4
-rw-r--r--webkit/tools/test_shell/simple_file_system.cc4
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc6
-rw-r--r--webkit/tools/test_shell/test_shell.cc8
-rw-r--r--webkit/tools/test_shell/test_webview_delegate_mac.mm2
-rw-r--r--webkit/tools/test_shell/webwidget_host_gtk.cc4
-rw-r--r--webkit/tools/test_shell/webwidget_host_mac.mm2
-rw-r--r--webkit/tools/test_shell/webwidget_host_win.cc2
8 files changed, 16 insertions, 16 deletions
diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc
index 05eb07ec..614dfb9 100644
--- a/webkit/tools/test_shell/simple_dom_storage_system.cc
+++ b/webkit/tools/test_shell/simple_dom_storage_system.cc
@@ -40,7 +40,7 @@ class SimpleDomStorageSystem::NamespaceImpl : public WebStorageNamespace {
private:
DomStorageContext* Context() {
- if (!parent_.get())
+ if (!parent_)
return NULL;
return parent_->context_.get();
}
@@ -65,7 +65,7 @@ class SimpleDomStorageSystem::AreaImpl : public WebStorageArea {
private:
DomStorageHost* Host() {
- if (!parent_.get())
+ if (!parent_)
return NULL;
return parent_->host_.get();
}
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index b3954c7..8b23259 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -91,7 +91,7 @@ void SimpleFileSystem::OpenFileSystem(
WebKit::WebFileSystemType type,
long long, bool create,
WebFileSystemCallbacks* callbacks) {
- if (!frame || !file_system_context_.get()) {
+ if (!frame || !file_system_context_) {
// The FileSystem temp directory was not initialized successfully.
callbacks->didFail(WebKit::WebFileErrorSecurity);
return;
@@ -107,7 +107,7 @@ void SimpleFileSystem::DeleteFileSystem(
WebFrame* frame,
WebKit::WebFileSystemType type,
WebFileSystemCallbacks* callbacks) {
- if (!frame || !file_system_context_.get()) {
+ if (!frame || !file_system_context_) {
callbacks->didFail(WebKit::WebFileErrorSecurity);
return;
}
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 69f2011..f0d1b25 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -500,7 +500,7 @@ class RequestProxy
void AsyncCancel() {
// This can be null in cases where the request is already done.
- if (!request_.get())
+ if (!request_)
return;
request_->Cancel();
@@ -510,7 +510,7 @@ class RequestProxy
void AsyncFollowDeferredRedirect(bool has_new_first_party_for_cookies,
const GURL& new_first_party_for_cookies) {
// This can be null in cases where the request is already done.
- if (!request_.get())
+ if (!request_)
return;
if (has_new_first_party_for_cookies)
@@ -520,7 +520,7 @@ class RequestProxy
void AsyncReadData() {
// This can be null in cases where the request is already done.
- if (!request_.get())
+ if (!request_)
return;
if (request_->status().is_success()) {
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 192c6b5..457ac85 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -157,7 +157,7 @@ TestShell::~TestShell() {
// DevTools frontend page is supposed to be navigated only once and
// loading another URL in that Page is an error.
- if (!dev_tools_client_.get()) {
+ if (!dev_tools_client_) {
// Navigate to an empty page to fire all the destruction logic for the
// current page.
LoadURL(GURL("about:blank"));
@@ -485,7 +485,7 @@ void TestShell::SizeToDefault() {
void TestShell::ResetTestController() {
notification_presenter_->Reset();
delegate_->Reset();
- if (geolocation_client_mock_.get())
+ if (geolocation_client_mock_)
geolocation_client_mock_->resetMock();
}
@@ -599,7 +599,7 @@ void TestShell::SetFocus(WebWidgetHost* host, bool enable) {
WebKit::WebDeviceOrientationClientMock*
TestShell::device_orientation_client_mock() {
- if (!device_orientation_client_mock_.get()) {
+ if (!device_orientation_client_mock_) {
device_orientation_client_mock_.reset(
WebKit::WebDeviceOrientationClientMock::create());
}
@@ -607,7 +607,7 @@ TestShell::device_orientation_client_mock() {
}
WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
- if (!geolocation_client_mock_.get()) {
+ if (!geolocation_client_mock_) {
geolocation_client_mock_.reset(
WebKit::WebGeolocationClientMock::create());
}
diff --git a/webkit/tools/test_shell/test_webview_delegate_mac.mm b/webkit/tools/test_shell/test_webview_delegate_mac.mm
index f7e58dff4..f7f676b 100644
--- a/webkit/tools/test_shell/test_webview_delegate_mac.mm
+++ b/webkit/tools/test_shell/test_webview_delegate_mac.mm
@@ -94,7 +94,7 @@ WebWidget* TestWebViewDelegate::createPopupMenu(
// WebWidgetClient ------------------------------------------------------------
void TestWebViewDelegate::show(WebNavigationPolicy policy) {
- if (!popup_menu_info_.get())
+ if (!popup_menu_info_)
return;
if (this != shell_->popup_delegate())
return;
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index 0807d53..593f1d5 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -354,12 +354,12 @@ void WebWidgetHost::Paint() {
gfx::Rect client_rect(width, height);
// Allocate a canvas if necessary
- if (!canvas_.get()) {
+ if (!canvas_) {
ResetScrollRect();
paint_rect_ = client_rect;
canvas_.reset(skia::CreatePlatformCanvas(width, height, true, 0,
skia::RETURN_NULL_ON_FAILURE));
- if (!canvas_.get()) {
+ if (!canvas_) {
// memory allocation failed, we can't paint.
LOG(ERROR) << "Failed to allocate memory for " << width << "x" << height;
return;
diff --git a/webkit/tools/test_shell/webwidget_host_mac.mm b/webkit/tools/test_shell/webwidget_host_mac.mm
index d96da26..c7d4a54 100644
--- a/webkit/tools/test_shell/webwidget_host_mac.mm
+++ b/webkit/tools/test_shell/webwidget_host_mac.mm
@@ -170,7 +170,7 @@ void WebWidgetHost::Paint() {
CGContextRef context = static_cast<CGContextRef>([view_context graphicsPort]);
// Allocate a canvas if necessary
- if (!canvas_.get()) {
+ if (!canvas_) {
ResetScrollRect();
paint_rect_ = client_rect;
canvas_.reset(skia::CreatePlatformCanvas(
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index 4df7da0..25ca05b 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -235,7 +235,7 @@ void WebWidgetHost::Paint() {
gfx::Rect client_rect(r);
// Allocate a canvas if necessary
- if (!canvas_.get()) {
+ if (!canvas_) {
ResetScrollRect();
paint_rect_ = client_rect;
canvas_.reset(skia::CreatePlatformCanvas(