Rename WindowDragDropDelegate->DragDropDelegate

ui/aura_shell/drag_drop_controller_unittest.cc

 // Copyright (c) 2011 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 "ui/aura_shell/drag_drop_controller.h"
 
 #include "base/location.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/event.h"
@@ skipping 154 matching lines @@
   gfx::Rect contents_view_bounds = contents_view->bounds();
   contents_view_bounds = contents_view_bounds.Union(view->bounds());
   contents_view->SetBoundsRect(contents_view_bounds);
   widget->SetBounds(contents_view_bounds);
 }
 
 }  // namespace
 
 class DragDropControllerTest : public AuraShellTestBase {
  public:
-  DragDropControllerTest() : AuraShellTestBase() {
-  }
-
-  virtual ~DragDropControllerTest() {
-    aura::RootWindow::GetInstance()->SetProperty(
-        aura::kRootWindowDragDropClientKey,
-        NULL);
-  }
+  DragDropControllerTest() : AuraShellTestBase() {}
+  virtual ~DragDropControllerTest() {}
 
   void SetUp() OVERRIDE {
     AuraShellTestBase::SetUp();
-    drag_drop_controller_ = new TestDragDropController;
+    drag_drop_controller_.reset(new TestDragDropController);
     drag_drop_controller_->set_should_block_during_drag_drop(false);
-    aura::RootWindow::GetInstance()->SetProperty(
-        aura::kRootWindowDragDropClientKey,
-        drag_drop_controller_);
+    aura::client::SetDragDropClient(drag_drop_controller_.get());
   }
 
   void TearDown() OVERRIDE {
-    delete drag_drop_controller_;
-    drag_drop_controller_ = NULL;
+    aura::client::SetDragDropClient(NULL);
+    drag_drop_controller_.reset();
     AuraShellTestBase::TearDown();
   }
 
   void UpdateDragData(ui::OSExchangeData* data) {
     drag_drop_controller_->drag_data_ = data;
   }
 
  protected:
-  TestDragDropController* drag_drop_controller_;
+  scoped_ptr<TestDragDropController> drag_drop_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DragDropControllerTest);
 };
 
 TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
   views::Widget* widget = CreateNewWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget, drag_view);
   gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
@@ skipping 204 matching lines @@
   EXPECT_EQ(num_drags_1 - 1 - drag_view->VerticalDragThreshold(),
       drag_view->num_drag_updates_);
   EXPECT_EQ(0, drag_view->num_drops_);
   EXPECT_EQ(0, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
   delete widget;
 }
 
 }  // namespace test
 }  // namespace aura