App Info: `View in Webstore` closes before navigating (not after)

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/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_renderer_host.h"
 #include "ui/base/page_transition_types.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/test/aura_test_helper.h"
-#include "ui/compositor/compositor.h"
-#include "ui/compositor/test/context_factories_for_test.h"
-#include "ui/wm/core/default_activation_client.h"
-#endif
-
-#if defined(USE_ASH)
+#if defined(OS_CHROMEOS)
 #include "ash/test/ash_test_helper.h"
-#include "ash/test/ash_test_views_delegate.h"
+#elif defined(TOOLKIT_VIEWS)
+#include "ui/views/test/scoped_views_test_helper.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),
       host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
@@ skipping 10 matching lines @@
 }
 
 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
 }
 
 void BrowserWithTestWindowTest::SetUp() {
   testing::Test::SetUp();
 #if defined(OS_CHROMEOS)
   // TODO(jamescook): Windows Ash support. This will require refactoring
   // AshTestHelper and AuraTestHelper so they can be used at the same time,
-  // perhaps by AshTestHelper owning an AuraTestHelper. Also, need to cleanup
-  // CreateViewsDelegate() below when cleanup done.
+  // perhaps by AshTestHelper owning an AuraTestHelper.
   ash_test_helper_.reset(new ash::test::AshTestHelper(
       base::MessageLoopForUI::current()));
   ash_test_helper_->SetUp(true);
-#elif defined(USE_AURA)
-  // 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
-
+#elif defined(TOOLKIT_VIEWS)
+  views_test_helper_.reset(new views::ScopedViewsTestHelper());
+#endif
 #if defined(TOOLKIT_VIEWS)
-#if !defined(OS_CHROMEOS)
-  views_delegate_.reset(CreateViewsDelegate());
-#endif // !OS_CHROMEOS
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
-#endif  // TOOLKIT_VIEWS
+#endif
 
   // 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()));
 }
 
 void BrowserWithTestWindowTest::TearDown() {
   // Some tests end up posting tasks to the DB thread that must be completed
   // before the profile can be destroyed and the test safely shut down.
   base::RunLoop().RunUntilIdle();
 
   // Reset the profile here because some profile keyed services (like the
   // audio service) depend on test stubs that the helpers below will remove.
   DestroyBrowserAndProfile();
 
+#if defined(TOOLKIT_VIEWS)
+  constrained_window::SetConstrainedWindowViewsClient(nullptr);
+#endif
+
 #if defined(OS_CHROMEOS)
   ash_test_helper_->TearDown();
-#elif defined(USE_AURA)
-  aura_test_helper_->TearDown();
-  ui::TerminateContextFactoryForTests();
+#elif defined(TOOLKIT_VIEWS)
+  views_test_helper_.reset();
 #endif
+
   testing::Test::TearDown();
 
   // A Task is leaked if we don't destroy everything, then run the message
   // loop.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
+}
 
-#if defined(TOOLKIT_VIEWS)
-  constrained_window::SetConstrainedWindowViewsClient(nullptr);
-  views_delegate_.reset(NULL);
+gfx::NativeWindow BrowserWithTestWindowTest::GetContext() {
+#if defined(OS_CHROMEOS)
+  return ash_test_helper_->CurrentContext();
+#elif defined(TOOLKIT_VIEWS)
+  return views_test_helper_->GetContext();
+#else
+  return nullptr;
 #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 108 matching lines @@
                                                  true /* trusted_source */,
                                                  gfx::Rect(),
                                                  profile,
                                                  host_desktop_type);
   } else {
     params.type = browser_type;
   }
   params.window = browser_window;
   return new Browser(params);
 }
-
-#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