Componentize Constrained Window Views

chrome/test/base/browser_with_test_window_test.cc

 // Copyright (c) 2012 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 "chrome/test/base/browser_with_test_window_test.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 12 matching lines @@
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/wm/core/default_activation_client.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/ash_test_views_delegate.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
+#include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
+#include "components/constrained_window/constrained_window_views.h"
 #include "ui/views/test/test_views_delegate.h"
 #endif
 
 using content::NavigationController;
 using content::RenderFrameHost;
 using content::RenderFrameHostTester;
 using content::WebContents;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : browser_type_(Browser::TYPE_TABBED),
@@ skipping 27 matching lines @@
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   aura_test_helper_.reset(new aura::test::AuraTestHelper(
       base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp(context_factory);
   new wm::DefaultActivationClient(aura_test_helper_->root_window());
 #endif  // USE_AURA
-#if !defined(OS_CHROMEOS) && defined(TOOLKIT_VIEWS)
+
+#if defined(TOOLKIT_VIEWS)
+#if !defined(OS_CHROMEOS)
   views_delegate_.reset(CreateViewsDelegate());
-#endif
+#endif // !OS_CHROMEOS
+  SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
+#endif  // TOOLKIT_VIEWS
 
   // Subclasses can provide their own Profile.
   profile_ = CreateProfile();
   // Subclasses can provide their own test BrowserWindow. If they return NULL
   // then Browser will create the a production BrowserWindow and the subclass
   // is responsible for cleaning it up (usually by NativeWidget destruction).
   window_.reset(CreateBrowserWindow());
 
   browser_.reset(CreateBrowser(profile(), browser_type_, hosted_app_,
                                host_desktop_type_, window_.get()));
@@ skipping 16 matching lines @@
 #endif
   testing::Test::TearDown();
 
   // A Task is leaked if we don't destroy everything, then run the message
   // loop.
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
 
 #if defined(TOOLKIT_VIEWS)
+  SetConstrainedWindowViewsClient(scoped_ptr<ConstrainedWindowViewsClient>());

[sky, 2014/10/24 18:04:22]

I think there was a conversion from nullptr->scoped_ptr<X>?

[oshima, 2014/10/24 20:36:47]

Hmm, it didn't work.

../../chrome/test/base/browser_with_test_window_test.cc:125:42: error: expected
')'
 
SetConstrainedWindowViewsClient(nullptr->scoped_ptr<ConstrainedWindowViewsClient>);

(I tried ..scoped_ptr<X>() but got the same error)



I may be doing something wrong, but it's actuall longer than above, so I'll
leave it as is.

[blundell, 2014/10/27 06:54:44]

I think the idea is that you now can do
SetConstrainedWindowViewsClient(nullptr), and the conversion happens
automagically.

   views_delegate_.reset(NULL);
 #endif
 }
 
 void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) {
   chrome::NavigateParams params(browser, url, ui::PAGE_TRANSITION_TYPED);
   params.tabstrip_index = 0;
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
   CommitPendingLoad(&params.target_contents->GetController());
@@ skipping 115 matching lines @@
 
 #if !defined(OS_CHROMEOS) && defined(TOOLKIT_VIEWS)
 views::ViewsDelegate* BrowserWithTestWindowTest::CreateViewsDelegate() {
 #if defined(USE_ASH)
   return new ash::test::AshTestViewsDelegate;
 #else
   return new views::TestViewsDelegate;
 #endif
 }
 #endif