Added MediaRouterUIBrowserTest::toolbar_action_view_ to a Widget.

chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
+#include "ui/views/widget/widget.h"
 
 namespace media_router {
 
 class MediaRouterUIBrowserTest : public InProcessBrowserTest {
  public:
   MediaRouterUIBrowserTest() {}
   ~MediaRouterUIBrowserTest() override {}
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
 
     BrowserActionsContainer* browser_actions_container =
         BrowserView::GetBrowserViewForBrowser(browser())
             ->toolbar()
             ->browser_actions();
     ASSERT_TRUE(browser_actions_container);
 
     browser_action_test_util_.reset(new BrowserActionTestUtil(browser(),
                                                               false));
     media_router_action_.reset(new MediaRouterAction(browser(),
         browser_action_test_util_->GetToolbarActionsBar()));
 
     // Sets delegate on |media_router_action_|.
     toolbar_action_view_.reset(
         new ToolbarActionView(media_router_action_.get(),
                               browser_actions_container));
+
+    toolbar_action_view_widget_.reset(new views::Widget);
+    views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
+    params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+    toolbar_action_view_widget_->Init(params);
+    toolbar_action_view_widget_->Show();
+    toolbar_action_view_widget_->SetContentsView(toolbar_action_view_.get());
   }
 
   void TearDownOnMainThread() override {
     toolbar_action_view_.reset();
     media_router_action_.reset();
     browser_action_test_util_.reset();
     InProcessBrowserTest::TearDownOnMainThread();
   }
 
   void OpenMediaRouterDialogAndWaitForNewWebContents() {
@@ skipping 24 matching lines @@
     EXPECT_TRUE(app_menu_button->IsMenuShowing());
     media_router_action_->ExecuteAction(true);
   }
 
  protected:
   // Must be initialized after |InProcessBrowserTest::SetUpOnMainThread|.
   scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
   scoped_ptr<MediaRouterAction> media_router_action_;
 
   // ToolbarActionView constructed to set the delegate on |mr_action|.
   scoped_ptr<ToolbarActionView> toolbar_action_view_;

[Evan Stade, 2016/03/17 21:41:35]

is this still the right ownership model? I'd expect that setcontentsview took
ownership (except if you change  owned_by_client_)

[bruthig, 2016/03/18 15:39:21]

Good catch, updated. PTAL

+
+  // Hosts the |toolbar_action_view_|.
+  scoped_ptr<views::Widget> toolbar_action_view_widget_;

[Evan Stade, 2016/03/17 21:41:35]

likewise aren't widgets usually self-owned? You just call Close when you don't
want it any more.

[bruthig, 2016/03/18 15:39:21]

Is this what you are suggesting, using a raw pointer and calling Close()?

 };
 
 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
                        OpenDialogWithMediaRouterAction) {
   // We start off at about:blank page.
   // Make sure there is 1 tab and media router is enabled.
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   OpenMediaRouterDialogAndWaitForNewWebContents();
 
   // Reload the browser and wait.
   content::TestNavigationObserver reload_observer(
       browser()->tab_strip_model()->GetActiveWebContents());
   chrome::Reload(browser(), CURRENT_TAB);
   reload_observer.Wait();
 
   // The reload should have removed the previously created dialog.
   // We expect a new dialog WebContents to be created by calling this.
   OpenMediaRouterDialogAndWaitForNewWebContents();
 
   // Navigate away.
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
 
   // The navigation should have removed the previously created dialog.
   // We expect a new dialog WebContents to be created by calling this.
   OpenMediaRouterDialogAndWaitForNewWebContents();
 }
 
 }  // namespace media_router