Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

BUG=423621

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

Cr-Commit-Position: refs/heads/master@{#299751}

21 files changed, 42 insertions, 59 deletions

diff --git a/ui/app_list/app_list_model.cc b/ui/app_list/app_list_model.cc
index b3512c8..0425f4c 100644
--- a/ui/app_list/app_list_model.cc
+++ b/ui/app_list/app_list_model.cc
@@ -339,8 +339,7 @@ AppListFolderItem* AppListModel::FindOrCreateFolderItem(
       new AppListFolderItem(folder_id, AppListFolderItem::FOLDER_TYPE_NORMAL));
   new_folder->set_position(
       top_level_item_list_->CreatePositionBefore(syncer::StringOrdinal()));
-  AppListItem* new_folder_item =
-      AddItemToItemListAndNotify(new_folder.PassAs<AppListItem>());
+  AppListItem* new_folder_item = AddItemToItemListAndNotify(new_folder.Pass());
   return static_cast<AppListFolderItem*>(new_folder_item);
 }
 
diff --git a/ui/app_list/test/app_list_test_model.cc b/ui/app_list/test/app_list_test_model.cc
index 9ec5258..8ab31d4 100644
--- a/ui/app_list/test/app_list_test_model.cc
+++ b/ui/app_list/test/app_list_test_model.cc
@@ -146,7 +146,7 @@ AppListTestModel::AppListTestItem* AppListTestModel::CreateItem(
 AppListTestModel::AppListTestItem* AppListTestModel::CreateAndAddItem(
     const std::string& id) {
   scoped_ptr<AppListTestItem> test_item(CreateItem(id));
-  AppListItem* item = AppListModel::AddItem(test_item.PassAs<AppListItem>());
+  AppListItem* item = AppListModel::AddItem(test_item.Pass());
   return static_cast<AppListTestItem*>(item);
 }
 void AppListTestModel::HighlightItemAt(int index) {
diff --git a/ui/compositor/float_animation_curve_adapter.cc b/ui/compositor/float_animation_curve_adapter.cc
index 139c7cf..308fc1e 100644
--- a/ui/compositor/float_animation_curve_adapter.cc
+++ b/ui/compositor/float_animation_curve_adapter.cc
@@ -22,12 +22,8 @@ double FloatAnimationCurveAdapter::Duration() const {
 }
 
 scoped_ptr<cc::AnimationCurve> FloatAnimationCurveAdapter::Clone() const {
-  scoped_ptr<FloatAnimationCurveAdapter> to_return(
-      new FloatAnimationCurveAdapter(tween_type_,
-                                     initial_value_,
-                                     target_value_,
-                                     duration_));
-  return to_return.PassAs<cc::AnimationCurve>();
+  return make_scoped_ptr(new FloatAnimationCurveAdapter(
+      tween_type_, initial_value_, target_value_, duration_));
 }
 
 float FloatAnimationCurveAdapter::GetValue(double t) const {
diff --git a/ui/compositor/transform_animation_curve_adapter.cc b/ui/compositor/transform_animation_curve_adapter.cc
index e0ae5ef..fa73140 100644
--- a/ui/compositor/transform_animation_curve_adapter.cc
+++ b/ui/compositor/transform_animation_curve_adapter.cc
@@ -27,12 +27,8 @@ double TransformAnimationCurveAdapter::Duration() const {
 }
 
 scoped_ptr<cc::AnimationCurve> TransformAnimationCurveAdapter::Clone() const {
-  scoped_ptr<TransformAnimationCurveAdapter> to_return(
-      new TransformAnimationCurveAdapter(tween_type_,
-                                         initial_value_,
-                                         target_value_,
-                                         duration_));
-  return to_return.PassAs<cc::AnimationCurve>();
+  return make_scoped_ptr(new TransformAnimationCurveAdapter(
+      tween_type_, initial_value_, target_value_, duration_));
 }
 
 gfx::Transform TransformAnimationCurveAdapter::GetValue(
@@ -95,11 +91,8 @@ double InverseTransformCurveAdapter::Duration() const {
 }
 
 scoped_ptr<cc::AnimationCurve> InverseTransformCurveAdapter::Clone() const {
-  scoped_ptr<InverseTransformCurveAdapter> to_return(
-      new InverseTransformCurveAdapter(base_curve_,
-                                       initial_value_,
-                                       duration_));
-  return to_return.PassAs<cc::AnimationCurve>();
+  return make_scoped_ptr(
+      new InverseTransformCurveAdapter(base_curve_, initial_value_, duration_));
 }
 
 gfx::Transform InverseTransformCurveAdapter::GetValue(
diff --git a/ui/events/gesture_detection/motion_event_buffer.cc b/ui/events/gesture_detection/motion_event_buffer.cc
index 11d2df7..26fc5ba6e 100644
--- a/ui/events/gesture_detection/motion_event_buffer.cc
+++ b/ui/events/gesture_detection/motion_event_buffer.cc
@@ -162,7 +162,7 @@ scoped_ptr<MotionEvent> ResampleMotionEvent(const MotionEvent& event0,
   event->set_action_index(event0.GetActionIndex());
   event->set_button_state(event0.GetButtonState());
 
-  return event.PassAs<MotionEvent>();
+  return event.Pass();
 }
 
 // MotionEvent implementation for storing multiple events, with the most
diff --git a/ui/events/gesture_detection/motion_event_generic.cc b/ui/events/gesture_detection/motion_event_generic.cc
index afda52a..ad853f5 100644
--- a/ui/events/gesture_detection/motion_event_generic.cc
+++ b/ui/events/gesture_detection/motion_event_generic.cc
@@ -153,7 +153,7 @@ scoped_ptr<MotionEvent> MotionEventGeneric::Clone() const {
 scoped_ptr<MotionEvent> MotionEventGeneric::Cancel() const {
   scoped_ptr<MotionEventGeneric> event(new MotionEventGeneric(*this));
   event->set_action(ACTION_CANCEL);
-  return event.PassAs<MotionEvent>();
+  return event.Pass();
 }
 
 void MotionEventGeneric::PushPointer(const PointerProperties& pointer) {
diff --git a/ui/events/latency_info.cc b/ui/events/latency_info.cc
index fe96055..9987908 100644
--- a/ui/events/latency_info.cc
+++ b/ui/events/latency_info.cc
@@ -130,7 +130,7 @@ scoped_refptr<base::debug::ConvertableToTraceFormat> AsTraceableData(
     coordinates->Append(coordinate_pair.release());
   }
   record_data->Set("coordinates", coordinates.release());
-  return LatencyInfoTracedValue::FromValue(record_data.PassAs<base::Value>());
+  return LatencyInfoTracedValue::FromValue(record_data.Pass());
 }
 
 }  // namespace
diff --git a/ui/events/ozone/evdev/event_factory_evdev.cc b/ui/events/ozone/evdev/event_factory_evdev.cc
index 0895c0a..5499339 100644
--- a/ui/events/ozone/evdev/event_factory_evdev.cc
+++ b/ui/events/ozone/evdev/event_factory_evdev.cc
@@ -74,13 +74,8 @@ scoped_ptr<EventConverterEvdev> CreateConverter(
     scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp =
         make_scoped_ptr(new GestureInterpreterLibevdevCros(
             params.modifiers, params.cursor, params.dispatch_callback));
-    scoped_ptr<EventReaderLibevdevCros> libevdev_reader =
-        make_scoped_ptr(new EventReaderLibevdevCros(
-            fd,
-            params.path,
-            params.id,
-            gesture_interp.PassAs<EventReaderLibevdevCros::Delegate>()));
-    return libevdev_reader.PassAs<EventConverterEvdev>();
+    return make_scoped_ptr(new EventReaderLibevdevCros(
+        fd, params.path, params.id, gesture_interp.Pass()));
   }
 #endif
 
diff --git a/ui/events/test/mock_motion_event.cc b/ui/events/test/mock_motion_event.cc
index 24d8159..f3de1dd 100644
--- a/ui/events/test/mock_motion_event.cc
+++ b/ui/events/test/mock_motion_event.cc
@@ -94,7 +94,7 @@ scoped_ptr<MotionEvent> MockMotionEvent::Clone() const {
 scoped_ptr<MotionEvent> MockMotionEvent::Cancel() const {
   scoped_ptr<MockMotionEvent> event(new MockMotionEvent(*this));
   event->set_action(MotionEvent::ACTION_CANCEL);
-  return event.PassAs<MotionEvent>();
+  return event.Pass();
 }
 
 void MockMotionEvent::PressPoint(float x, float y) {
diff --git a/ui/gfx/geometry/r_tree_base.cc b/ui/gfx/geometry/r_tree_base.cc
index e93e1d5..fd5deab 100644
--- a/ui/gfx/geometry/r_tree_base.cc
+++ b/ui/gfx/geometry/r_tree_base.cc
@@ -463,7 +463,7 @@ scoped_ptr<RTreeBase::NodeBase> RTreeBase::Node::DivideChildren(
   for (size_t i = 0; i < sibling->children_.size(); ++i)
     sibling->children_[i]->set_parent(sibling.get());
 
-  return sibling.PassAs<NodeBase>();
+  return sibling.Pass();
 }
 
 RTreeBase::Node* RTreeBase::Node::LeastOverlapIncrease(
diff --git a/ui/gfx/geometry/r_tree_unittest.cc b/ui/gfx/geometry/r_tree_unittest.cc
index ba45405..d4da8ef 100644
--- a/ui/gfx/geometry/r_tree_unittest.cc
+++ b/ui/gfx/geometry/r_tree_unittest.cc
@@ -279,14 +279,14 @@ TEST_F(RTreeNodeTest, CompareCenterDistanceFromParent) {
   // Add three children, one each with centers at (0, 0), (10, 10), (-9, -9),
   // around which a bounding box will be centered at (0, 0)
   scoped_ptr<RTreeRecord> center_zero(new RTreeRecord(Rect(-1, -1, 2, 2), 1));
-  parent->AddChild(center_zero.PassAs<RTreeNodeBase>());
+  parent->AddChild(center_zero.Pass());
 
   scoped_ptr<RTreeRecord> center_positive(new RTreeRecord(Rect(9, 9, 2, 2), 2));
-  parent->AddChild(center_positive.PassAs<RTreeNodeBase>());
+  parent->AddChild(center_positive.Pass());
 
   scoped_ptr<RTreeRecord> center_negative(
       new RTreeRecord(Rect(-10, -10, 2, 2), 3));
-  parent->AddChild(center_negative.PassAs<RTreeNodeBase>());
+  parent->AddChild(center_negative.Pass());
 
   ValidateNode(parent.get(), 1U, 5U);
   EXPECT_EQ(Rect(-10, -10, 21, 21), parent->rect());
@@ -511,7 +511,7 @@ TEST_F(RTreeNodeTest, DivideChildren) {
   for (int i = 1; i <= 10; ++i) {
     scoped_ptr<RTreeRecord> record(new RTreeRecord(Rect(0, 0, i, i), i));
     sorted_children.push_back(record.get());
-    test_node->AddChild(record.PassAs<RTreeNodeBase>());
+    test_node->AddChild(record.Pass());
     low_bounds.push_back(Rect(0, 0, i, i));
     high_bounds.push_back(Rect(0, 0, 10, 10));
   }
@@ -584,13 +584,13 @@ TEST_F(RTreeNodeTest, RemoveChildOrphans) {
             new RTreeRecord(Rect(0, 0, id, id), id));
         ++id;
         records.push_back(record.get());
-        level_0_child->AddChild(record.PassAs<RTreeNodeBase>());
+        level_0_child->AddChild(record.Pass());
       }
       level_0_children.push_back(level_0_child.get());
-      level_1_child->AddChild(level_0_child.PassAs<RTreeNodeBase>());
+      level_1_child->AddChild(level_0_child.Pass());
     }
     level_1_children.push_back(level_1_child.get());
-    root->AddChild(level_1_child.PassAs<RTreeNodeBase>());
+    root->AddChild(level_1_child.Pass());
   }
 
   // This should now be a valid tree structure.
@@ -659,8 +659,8 @@ TEST_F(RTreeNodeTest, LeastOverlapIncrease) {
     scoped_ptr<RTreeNode> node(new RTreeNode);
     scoped_ptr<RTreeRecord> record(
         new RTreeRecord(Rect(i * 2, 0, 1, 2), i + 1));
-    node->AddChild(record.PassAs<RTreeNodeBase>());
-    test_parent->AddChild(node.PassAs<RTreeNodeBase>());
+    node->AddChild(record.Pass());
+    test_parent->AddChild(node.Pass());
   }
 
   ValidateNode(test_parent.get(), 1U, 5U);
@@ -710,7 +710,7 @@ TEST_F(RTreeNodeTest, LeastOverlapIncrease) {
   scoped_ptr<RTreeNode> record_parent(new RTreeNode);
   record_parent->AddChild(
       scoped_ptr<RTreeNodeBase>(new RTreeRecord(Rect(4, 0, 2, 2), 9)));
-  test_parent->AddChild(record_parent.PassAs<RTreeNodeBase>());
+  test_parent->AddChild(record_parent.Pass());
   BuildExpandedRects(test_parent.get(), test_rect_inside, &expanded_rects);
   result = NodeLeastOverlapIncrease(
       test_parent.get(), test_rect_inside, expanded_rects);
@@ -728,19 +728,19 @@ TEST_F(RTreeNodeTest, LeastAreaEnlargement) {
   scoped_ptr<RTreeNode> node(new RTreeNode);
   node->AddChild(
       scoped_ptr<RTreeNodeBase>(new RTreeRecord(Rect(1, 0, 1, 1), 1)));
-  test_parent->AddChild(node.PassAs<RTreeNodeBase>());
+  test_parent->AddChild(node.Pass());
   node.reset(new RTreeNode);
   node->AddChild(
       scoped_ptr<RTreeNodeBase>(new RTreeRecord(Rect(0, 1, 1, 1), 2)));
-  test_parent->AddChild(node.PassAs<RTreeNodeBase>());
+  test_parent->AddChild(node.Pass());
   node.reset(new RTreeNode);
   node->AddChild(
       scoped_ptr<RTreeNodeBase>(new RTreeRecord(Rect(2, 1, 1, 1), 3)));
-  test_parent->AddChild(node.PassAs<RTreeNodeBase>());
+  test_parent->AddChild(node.Pass());
   node.reset(new RTreeNode);
   node->AddChild(
       scoped_ptr<RTreeNodeBase>(new RTreeRecord(Rect(1, 2, 1, 1), 4)));
-  test_parent->AddChild(node.PassAs<RTreeNodeBase>());
+  test_parent->AddChild(node.Pass());
 
   ValidateNode(test_parent.get(), 1U, 5U);
 
@@ -779,7 +779,7 @@ TEST_F(RTreeNodeTest, LeastAreaEnlargement) {
   node.reset(new RTreeNode);
   node->AddChild(
       scoped_ptr<RTreeNodeBase>(new RTreeRecord(Rect(0, 1, 3, 1), 7)));
-  test_parent->AddChild(node.PassAs<RTreeNodeBase>());
+  test_parent->AddChild(node.Pass());
 
   ValidateNode(test_parent.get(), 1U, 5U);
 
diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc
index 247ba28..0c3a43e 100644
--- a/ui/ozone/platform/caca/caca_window_manager.cc
+++ b/ui/ozone/platform/caca/caca_window_manager.cc
@@ -135,7 +135,7 @@ scoped_ptr<ui::SurfaceOzoneCanvas> CacaWindowManager::CreateCanvasForWidget(
   scoped_ptr<CacaSurface> canvas(new CacaSurface(window));
   bool initialized = canvas->Initialize();
   DCHECK(initialized);
-  return canvas.PassAs<ui::SurfaceOzoneCanvas>();
+  return canvas.Pass();
 }
 
 }  // namespace ui
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc
index a34f014..c3b3233 100644
--- a/ui/ozone/platform/caca/ozone_platform_caca.cc
+++ b/ui/ozone/platform/caca/ozone_platform_caca.cc
@@ -39,8 +39,8 @@ class OzonePlatformCaca : public OzonePlatform {
     scoped_ptr<CacaWindow> caca_window(new CacaWindow(
         delegate, window_manager_.get(), event_source_.get(), bounds));
     if (!caca_window->Initialize())
-      return scoped_ptr<PlatformWindow>();
-    return caca_window.PassAs<PlatformWindow>();
+      return nullptr;
+    return caca_window.Pass();
   }
   virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
diff --git a/ui/ozone/platform/dri/gbm_surface_factory.cc b/ui/ozone/platform/dri/gbm_surface_factory.cc
index 59f6a4c..e04ae8e 100644
--- a/ui/ozone/platform/dri/gbm_surface_factory.cc
+++ b/ui/ozone/platform/dri/gbm_surface_factory.cc
@@ -153,9 +153,9 @@ scoped_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
 
   scoped_ptr<GbmSurface> surface(new GbmSurface(delegate, device_, drm_));
   if (!surface->Initialize())
-    return scoped_ptr<SurfaceOzoneEGL>();
+    return nullptr;
 
-  return surface.PassAs<SurfaceOzoneEGL>();
+  return surface.Pass();
 }
 
 scoped_ptr<SurfaceOzoneEGL>
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc
index 88d6207..63750e2 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc
@@ -72,7 +72,7 @@ class OzonePlatformDri : public OzonePlatform {
                       event_factory_ozone_.get(),
                       window_manager_.get()));
     platform_window->Initialize();
-    return platform_window.PassAs<PlatformWindow>();
+    return platform_window.Pass();
   }
   virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc
index 737689c..344422b 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
@@ -104,7 +104,7 @@ class OzonePlatformGbm : public OzonePlatform {
                       event_factory_ozone_.get(),
                       window_manager_.get()));
     platform_window->Initialize();
-    return platform_window.PassAs<PlatformWindow>();
+    return platform_window.Pass();
   }
   virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc
index 531da17..e3eb3c8 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -253,7 +253,7 @@ void BubbleFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
 
 void BubbleFrameView::SetBubbleBorder(scoped_ptr<BubbleBorder> border) {
   bubble_border_ = border.get();
-  SetBorder(border.PassAs<Border>());
+  SetBorder(border.Pass());
 
   // Update the background, which relies on the border.
   set_background(new views::BubbleBackground(bubble_border_));
diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc
index e67dc64..0a3a8f6 100644
--- a/ui/views/controls/button/checkbox.cc
+++ b/ui/views/controls/button/checkbox.cc
@@ -24,7 +24,7 @@ Checkbox::Checkbox(const base::string16& label)
   button_border->SetPainter(false, STATE_PRESSED, NULL);
   // Inset the trailing side by a couple pixels for the focus border.
   button_border->set_insets(gfx::Insets(0, 0, 0, 2));
-  SetBorder(button_border.PassAs<Border>());
+  SetBorder(button_border.Pass());
   SetFocusable(true);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 300c5a7..fe522d9 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -444,7 +444,7 @@ void LabelButton::UpdateThemedBorder() {
   } else
 #endif
   {
-    SetBorder(label_button_border.PassAs<Border>());
+    SetBorder(label_button_border.Pass());
   }
 
   border_is_themed_border_ = true;
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index 62b8ec3..22689c7 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -636,7 +636,7 @@ void Combobox::UpdateBorder() {
     border->SetInsets(5, 10, 5, 10);
   if (invalid_)
     border->SetColor(kWarningColor);
-  SetBorder(border.PassAs<Border>());
+  SetBorder(border.Pass());
 }
 
 void Combobox::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
diff --git a/ui/views/touchui/touch_editing_menu.cc b/ui/views/touchui/touch_editing_menu.cc
index 47f2bdb..771bfb3 100644
--- a/ui/views/touchui/touch_editing_menu.cc
+++ b/ui/views/touchui/touch_editing_menu.cc
@@ -154,7 +154,7 @@ Button* TouchEditingMenuView::CreateButton(const base::string16& title,
   int h_border = (kMenuButtonWidth - gfx::GetStringWidth(label, font_list)) / 2;
   button_border->set_insets(
       gfx::Insets(v_border, h_border, v_border, h_border));
-  button->SetBorder(button_border.PassAs<Border>());
+  button->SetBorder(button_border.Pass());
   button->SetFontList(font_list);
   button->set_tag(tag);
   return button;