Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.

content/browser/web_contents/web_contents_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/dip_util.h"
@@ skipping 480 matching lines @@
 
  private:
   friend class base::DeleteHelper<content::ShadowWindow>;
 
   virtual ~ShadowWindow() {
     if (window_)
       window_->RemoveObserver(this);
   }
 
   void UpdateShadowBounds() {
-    if (!shadow_.get())
+    if (!shadow_)
       return;
     gfx::Rect bound;
     switch (edge_) {
       case SHADOW_LEFT:
         bound.SetRect(-kShadowThick, 0, kShadowThick, bounds().height());
         break;
       case SHADOW_RIGHT:
         bound.SetRect(bounds().right(), 0, kShadowThick, bounds().height());
         break;
       case SHADOW_TOP:
@@ skipping 377 matching lines @@
   window_observer_.reset();
 #if defined(OS_WIN)
   child_window_observer_.reset();
 #endif
   // Window needs a valid delegate during its destructor, so we explicitly
   // delete it here.
   window_.reset();
 }
 
 void WebContentsViewAura::SetupOverlayWindowForTesting() {
-  if (navigation_overlay_.get())
+  if (navigation_overlay_)
     navigation_overlay_->SetupForTesting();
 }
 
 void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) {
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
   RenderWidgetHostView* rwhv =
       web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
@@ skipping 10 matching lines @@
   rvh->DragSourceEndedAt(client_loc.x(), client_loc.y(), screen_loc.x(),
       screen_loc.y(), ops);
 }
 
 void WebContentsViewAura::PrepareOverscrollWindow() {
   // If there is an existing |overscroll_window_| which is in the middle of an
   // animation, then destroying the window here causes the animation to be
   // completed immidiately, which triggers |OnImplicitAnimationsCompleted()|
   // callback, and that tries to reset |overscroll_window_| again, causing a
   // double-free. So use a temporary variable here.
-  if (overscroll_window_.get()) {
+  if (overscroll_window_) {
     base::AutoReset<OverscrollMode> reset_state(&current_overscroll_gesture_,
                                                 current_overscroll_gesture_);
     scoped_ptr<aura::Window> reset_window(overscroll_window_.release());
   }
 
   OverscrollWindowDelegate* overscroll_delegate = new OverscrollWindowDelegate(
       web_contents_,
       current_overscroll_gesture_);
   overscroll_window_.reset(new aura::Window(overscroll_delegate));
   overscroll_window_->SetType(aura::client::WINDOW_TYPE_CONTROL);
   overscroll_window_->SetTransparent(true);
   overscroll_window_->Init(ui::LAYER_TEXTURED);
   overscroll_window_->layer()->SetMasksToBounds(true);
   overscroll_window_->SetName("OverscrollOverlay");
 
   overscroll_change_brightness_ = overscroll_delegate->has_screenshot();
   window_->AddChild(overscroll_window_.get());
 
   gfx::Rect bounds = gfx::Rect(window_->bounds().size());
   if (ShouldNavigateForward(web_contents_->GetController(),
                             current_overscroll_gesture_)) {
     // The overlay will be sliding in from the right edge towards the left in
     // non-RTL, or sliding in from the left edge towards the right in RTL.
     // So position the overlay window accordingly.
     bounds.Offset(base::i18n::IsRTL() ? -bounds.width() : bounds.width(), 0);
   }
 
-  if (GetWindowToAnimateForOverscroll() == overscroll_window_.get()) {
+  if (GetWindowToAnimateForOverscroll() == overscroll_window_) {
     overscroll_delegate->set_show_shadow(true);
     window_->StackChildAbove(overscroll_window_.get(), content_container_);
   } else {
     window_->StackChildBelow(overscroll_window_.get(), content_container_);
 
     switch (current_overscroll_gesture_) {
       case OVERSCROLL_EAST:
         content_container_->SetShadowEdge(SHADOW_LEFT);
         break;
 
@@ skipping 200 matching lines @@
 }
 
 void WebContentsViewAura::SetInitialFocus() {
   if (web_contents_->FocusLocationBarByDefault())
     web_contents_->SetFocusToLocationBar(false);
   else
     Focus();
 }
 
 void WebContentsViewAura::StoreFocus() {
-  if (delegate_.get())
+  if (delegate_)
     delegate_->StoreFocus();
 }
 
 void WebContentsViewAura::RestoreFocus() {
-  if (delegate_.get())
+  if (delegate_)
     delegate_->RestoreFocus();
 }
 
 WebDropData* WebContentsViewAura::GetDropData() const {
   return current_drop_data_.get();
 }
 
 gfx::Rect WebContentsViewAura::GetViewBounds() const {
   return window_->GetBoundsInScreen();
 }
@@ skipping 31 matching lines @@
   window_->SetName("WebContentsViewAura");
 
   window_observer_.reset(new WindowObserver(this));
 #if defined(OS_WIN)
   child_window_observer_.reset(new ChildWindowObserver(this));
 #endif
 
   // delegate_->GetDragDestDelegate() creates a new delegate on every call.
   // Hence, we save a reference to it locally. Similar model is used on other
   // platforms as well.
-  if (delegate_.get())
+  if (delegate_)
     drag_dest_delegate_ = delegate_->GetDragDestDelegate();
 }
 
 RenderWidgetHostView* WebContentsViewAura::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
   if (render_widget_host->GetView()) {
     // During testing, the view will already be set up in most cases to the
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
@@ skipping 16 matching lines @@
   view->Show();
 
   // We listen to drag drop events in the newly created view's window.
   aura::client::SetDragDropDelegate(view->GetNativeView(), this);
 
   RenderWidgetHostImpl* host_impl =
       RenderWidgetHostImpl::From(render_widget_host);
   if (host_impl->overscroll_controller() && web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->CanOverscrollContent()) {
     host_impl->overscroll_controller()->set_delegate(this);
-    if (!navigation_overlay_.get())
+    if (!navigation_overlay_)
       navigation_overlay_.reset(new OverscrollNavigationOverlay());
   }
 
   return view;
 }
 
 RenderWidgetHostView* WebContentsViewAura::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   return RenderWidgetHostViewPort::CreateViewForWidget(render_widget_host);
 }
@@ skipping 21 matching lines @@
       host->overscroll_controller()->set_delegate(this);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, RenderViewHostDelegateView implementation:
 
 void WebContentsViewAura::ShowContextMenu(
     const ContextMenuParams& params,
     ContextMenuSourceType type) {
-  if (delegate_.get())
+  if (delegate_)
     delegate_->ShowContextMenu(params, type);
 }
 
 void WebContentsViewAura::ShowPopupMenu(const gfx::Rect& bounds,
                                         int item_height,
                                         double item_font_size,
                                         int selected_item,
                                         const std::vector<WebMenuItem>& items,
                                         bool right_aligned,
                                         bool allow_multiple_selection) {
@@ skipping 160 matching lines @@
   return gfx::Size();
 }
 
 gfx::Size WebContentsViewAura::GetMaximumSize() const {
   return gfx::Size();
 }
 
 void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
                                           const gfx::Rect& new_bounds) {
   SizeChangedCommon(new_bounds.size());
-  if (delegate_.get())
+  if (delegate_)
     delegate_->SizeChanged(new_bounds.size());
 
   // Constrained web dialogs, need to be kept centered over our content area.
   for (size_t i = 0; i < window_->children().size(); i++) {
     if (window_->children()[i]->GetProperty(
             aura::client::kConstrainedWindowKey)) {
       gfx::Rect bounds = window_->children()[i]->bounds();
       bounds.set_origin(
           gfx::Point((new_bounds.width() - bounds.width()) / 2,
                      (new_bounds.height() - bounds.height()) / 2));
@@ skipping 155 matching lines @@
       event.location(),
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   current_drop_data_.reset();
   return current_drag_op_;
 }
 
 }  // namespace content