Fix the browser match rules.

chrome/test/base/test_browser_window.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/test_browser_window.h"
 
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "ui/gfx/geometry/rect.h"
 
-
 // Helpers --------------------------------------------------------------------
 
 namespace chrome {
 
 namespace {
 
 // Handles destroying a TestBrowserWindow when the Browser it is attached to is
 // destroyed.
 class TestBrowserWindowOwner : public chrome::BrowserListObserver {
  public:
   explicit TestBrowserWindowOwner(TestBrowserWindow* window) : window_(window) {
     BrowserList::AddObserver(this);
   }
   ~TestBrowserWindowOwner() override { BrowserList::RemoveObserver(this); }
 
  private:
   // Overridden from BrowserListObserver:
   void OnBrowserRemoved(Browser* browser) override {
     if (browser->window() == window_.get())
       delete this;
   }
 
   scoped_ptr<TestBrowserWindow> window_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowOwner);
 };
 
 }  // namespace
 
-Browser* CreateBrowserWithTestWindowForParams(Browser::CreateParams* params) {
+scoped_ptr<Browser> CreateBrowserWithTestWindowForParams(
+    Browser::CreateParams* params) {
   TestBrowserWindow* window = new TestBrowserWindow;
   new TestBrowserWindowOwner(window);
   params->window = window;
-  return new Browser(*params);
+  return make_scoped_ptr(new Browser(*params));
 }
 
+#if defined(USE_AURA)
+scoped_ptr<Browser> CreateBrowserWithAuraTestWindowForParams(
+    scoped_ptr<aura::Window> window,
+    Browser::CreateParams* params) {
+  if (window.get() == nullptr) {
+    window.reset(new aura::Window(nullptr));
+    window->set_id(0);
+    window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
+    window->Init(ui::LAYER_TEXTURED);
+    window->Show();
+  }
+
+  TestBrowserWindowAura* browser_window =
+      new TestBrowserWindowAura(window.Pass());
+  new TestBrowserWindowOwner(browser_window);
+  return browser_window->CreateBrowser(params);
+}
+#endif  // defined(USE_AURA)
+
 }  // namespace chrome
 
 
 // TestBrowserWindow::TestLocationBar -----------------------------------------
 
 GURL TestBrowserWindow::TestLocationBar::GetDestinationURL() const {
   return GURL();
 }
 
 WindowOpenDisposition
@@ skipping 166 matching lines @@
   return 0;
 }
 
 void TestBrowserWindow::ExecuteExtensionCommand(
     const extensions::Extension* extension,
     const extensions::Command& command) {}
 
 ExclusiveAccessContext* TestBrowserWindow::GetExclusiveAccessContext() {
   return nullptr;
 }
+
+#if defined(USE_AURA)
+
+// TestBrowserWindowAura -------------------------------------------------------
+
+TestBrowserWindowAura::TestBrowserWindowAura(
+    scoped_ptr<aura::Window> native_window)
+    : native_window_(native_window.Pass()) {
+}
+
+TestBrowserWindowAura::~TestBrowserWindowAura() {
+}
+
+gfx::NativeWindow TestBrowserWindowAura::GetNativeWindow() const {
+  return native_window_.get();
+}
+
+void TestBrowserWindowAura::Show() {
+  native_window_->Show();
+}
+
+void TestBrowserWindowAura::Hide() {
+  native_window_->Hide();
+}
+
+gfx::Rect TestBrowserWindowAura::GetBounds() const {
+  return native_window_->bounds();
+}
+
+scoped_ptr<Browser> TestBrowserWindowAura::CreateBrowser(
+    Browser::CreateParams* params) {
+  params->window = this;
+  browser_ = new Browser(*params);
+  return make_scoped_ptr(browser_);
+}
+
+#endif