Refactor ViewsDelegate singleton

ui/views/controls/webview/webview_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/views/controls/webview/webview.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_browser_context.h"
@@ skipping 111 matching lines @@
   WebViewUnitTest()
       : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()),
         file_blocking_thread_(content::BrowserThread::FILE_USER_BLOCKING,
                               base::MessageLoop::current()),
         io_thread_(content::BrowserThread::IO, base::MessageLoop::current()),
         top_level_widget_(nullptr) {}
 
   ~WebViewUnitTest() override {}
 
   void SetUp() override {
-    // The ViewsDelegate is deleted when the ViewsTestBase class is torn down.
-    WidgetTest::set_views_delegate(new WebViewTestViewsDelegate);
+    set_views_delegate(make_scoped_ptr(new WebViewTestViewsDelegate));
     browser_context_.reset(new content::TestBrowserContext);
     WidgetTest::SetUp();
     // Set the test content browser client to avoid pulling in needless
     // dependencies from content.
     SetBrowserClientForTesting(&test_browser_client_);
 
     // Create a top level widget and add a child, and give it a WebView as a
     // child.
     top_level_widget_ = CreateTopLevelFramelessPlatformWidget();
     top_level_widget_->SetBounds(gfx::Rect(0, 10, 100, 100));
@@ skipping 25 matching lines @@
   scoped_ptr<content::WebContents> CreateWebContents() const {
     return make_scoped_ptr(content::WebContents::Create(
         content::WebContents::CreateParams(browser_context_.get())));
   }
 
  private:
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_blocking_thread_;
   content::TestBrowserThread io_thread_;
   scoped_ptr<content::TestBrowserContext> browser_context_;
-  scoped_ptr<WebViewTestViewsDelegate> views_delegate_;
   content::TestContentBrowserClient test_browser_client_;
 
   Widget* top_level_widget_;
   WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewUnitTest);
 };
 
 // Tests that attaching and detaching a WebContents to a WebView makes the
 // WebContents visible and hidden respectively.
@@ skipping 240 matching lines @@
       gfx::Point(),  // Immaterial.
       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
   EXPECT_FALSE(static_cast<views::View*>(web_view())->
                   OnMousePressed(click_inside_holder));
   EXPECT_FALSE(web_view()->HasFocus());
   EXPECT_FALSE(holder()->HasFocus());
   EXPECT_TRUE(something_to_focus->HasFocus());
 }
 
 }  // namespace views