Rename WindowDragDropDelegate->DragDropDelegate

Move D&D client stuff into client namespace.
Provide some convenient getters/setters.

BUG=none
TEST=existing automation
TBR=sky
Review URL: http://codereview.chromium.org/8949010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114595 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 15 deletions

diff --git a/ui/aura_shell/drag_drop_controller_unittest.cc b/ui/aura_shell/drag_drop_controller_unittest.cc
index 6ef90f0..f05ca81 100644
--- a/ui/aura_shell/drag_drop_controller_unittest.cc
+++ b/ui/aura_shell/drag_drop_controller_unittest.cc
@@ -172,27 +172,19 @@ void AddViewToWidgetAndResize(views::Widget* widget, views::View* view) {
 
 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();
   }
 
@@ -201,7 +193,7 @@ class DragDropControllerTest : public AuraShellTestBase {
   }
 
  protected:
-  TestDragDropController* drag_drop_controller_;
+  scoped_ptr<TestDragDropController> drag_drop_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DragDropControllerTest);