Refactor ViewsDelegate singleton

ui/app_list/views/app_list_view_unittest.cc

 // Copyright 2014 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/app_list/views/app_list_view.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/search_result_page_view.h"
 #include "ui/app_list/views/search_result_tile_item_view.h"
 #include "ui/app_list/views/start_page_view.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/app_list/views/tile_item_view.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace app_list {
 namespace test {
 
 namespace {
 
 enum TestType {
@@ skipping 653 matching lines @@
 };
 
 class AppListViewTestDesktop : public views::ViewsTestBase,
                                public ::testing::WithParamInterface<int> {
  public:
   AppListViewTestDesktop() {}
   virtual ~AppListViewTestDesktop() {}
 
   // testing::Test overrides:
   void SetUp() override {
-    set_views_delegate(new AppListViewTestViewsDelegate(this));
+    scoped_ptr<views::TestViewsDelegate> views_delegate(
+        new AppListViewTestViewsDelegate(this));
+    set_views_delegate(views_delegate.Pass());
     views::ViewsTestBase::SetUp();
     test_context_.reset(new AppListViewTestContext(GetParam(), NULL));
   }
 
   void TearDown() override {
     test_context_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
@@ skipping 117 matching lines @@
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 #endif
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list