Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / cocoa / app_list_window_controller_unittest.mm

diff --git a/src/ui/app_list/cocoa/app_list_window_controller_unittest.mm b/src/ui/app_list/cocoa/app_list_window_controller_unittest.mm
index 672363b..03b74b4 100644 (file)
--- a/src/ui/app_list/cocoa/app_list_window_controller_unittest.mm
+++ b/src/ui/app_list/cocoa/app_list_window_controller_unittest.mm
@@ -10,7 +10,7 @@
 #import "ui/app_list/cocoa/app_list_window_controller.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
-#import "ui/base/test/ui_cocoa_test_helper.h"
+#import "ui/gfx/test/ui_cocoa_test_helper.h"
 
 namespace {
 
@@ -19,32 +19,31 @@ class AppListWindowControllerTest : public ui::CocoaTest {
   AppListWindowControllerTest();
 
  protected:
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   base::scoped_nsobject<AppListWindowController> controller_;
 
   app_list::test::AppListTestViewDelegate* delegate() {
-    return static_cast<app_list::test::AppListTestViewDelegate*>(
-        [[controller_ appListViewController] delegate]);
+    return delegate_.get();
   }
 
  private:
+  scoped_ptr<app_list::test::AppListTestViewDelegate> delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(AppListWindowControllerTest);
 };
 
-AppListWindowControllerTest::AppListWindowControllerTest() {
+AppListWindowControllerTest::AppListWindowControllerTest()
+    : delegate_(new app_list::test::AppListTestViewDelegate) {
   Init();
-  scoped_ptr<app_list::AppListViewDelegate> delegate(
-      new app_list::test::AppListTestViewDelegate);
   controller_.reset([[AppListWindowController alloc] init]);
-  [[controller_ appListViewController] setDelegate:delegate.Pass()];
+  [[controller_ appListViewController] setDelegate:delegate()];
 }
 
 void AppListWindowControllerTest::TearDown() {
   EXPECT_TRUE(controller_.get());
   [[controller_ window] close];
-  [[controller_ appListViewController]
-     setDelegate:scoped_ptr<app_list::AppListViewDelegate>()];
+  [[controller_ appListViewController] setDelegate:NULL];
   controller_.reset();
   ui::CocoaTest::TearDown();
 }