Refactor ViewsDelegate singleton

ui/views/controls/webview/webview_interactive_uitest.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/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_context.h"
@@ skipping 25 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WebViewTestViewsDelegate);
 };
 
 class WebViewInteractiveUiTest : public views::test::WidgetTest {
  public:
   WebViewInteractiveUiTest()
       : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()) {}
 
   void SetUp() override {
     gfx::GLSurface::InitializeOneOffForTests();
-    // 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));
     WidgetTest::SetUp();
   }
 
  protected:
   content::BrowserContext* browser_context() { return &browser_context_; }
 
  private:
   content::TestBrowserContext browser_context_;
   views::WebViewTestHelper webview_test_helper_;
   content::TestBrowserThread ui_thread_;
@@ skipping 50 matching lines @@
   ui::TextInputClient* client2 = webview->GetTextInputClient();
   EXPECT_NE(nullptr, client2);
   EXPECT_EQ(text_input_focus_manager->GetFocusedTextInputClient(), client2);
   EXPECT_NE(client1, client2);
 
   widget->Close();
   RunPendingMessages();
 }
 
 }  // namespace