Rename WindowDragDropDelegate->DragDropDelegate

ui/aura_shell/drag_drop_controller_unittest.cc

Index: ui/aura_shell/drag_drop_controller_unittest.cc
===================================================================
--- ui/aura_shell/drag_drop_controller_unittest.cc	(revision 114593)
+++ ui/aura_shell/drag_drop_controller_unittest.cc	(working copy)
@@ -172,27 +172,19 @@
 
 class DragDropControllerTest : public AuraShellTestBase {
  public:
-  DragDropControllerTest() : AuraShellTestBase() {
-  }
+  DragDropControllerTest() : AuraShellTestBase() {}
+  virtual ~DragDropControllerTest() {}
 
-  virtual ~DragDropControllerTest() {
-    aura::RootWindow::GetInstance()->SetProperty(
-        aura::kRootWindowDragDropClientKey,
-        NULL);
-  }
-
   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();
   }
 
@@ -201,7 +193,7 @@
   }
 
  protected:
-  TestDragDropController* drag_drop_controller_;
+  scoped_ptr<TestDragDropController> drag_drop_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DragDropControllerTest);