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/aura/window.h"

[msw, 2015/07/08 01:14:00]

nit: this isn't needed, given the include in the header, but if you want it
here, it should only be used for USE_AURA

[xdai1, 2015/07/08 21:34:21]

Sorry missed this one. Removed it.

 #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:
@@ skipping 16 matching lines @@
 
 }  // namespace
 
 Browser* CreateBrowserWithTestWindowForParams(Browser::CreateParams* params) {
   TestBrowserWindow* window = new TestBrowserWindow;
   new TestBrowserWindowOwner(window);
   params->window = window;
   return new Browser(*params);
 }
 
+#if defined(USE_AURA)
+Browser* CreateBrowserWithAuraTestWindowForParams(
+    const Browser::CreateParams& params) {
+  aura::Window* window = new aura::Window(nullptr);

[msw, 2015/07/08 01:14:00]

nit: make |window| a scoped_ptr and pass into the ctor for clearer ownership.

[xdai1, 2015/07/08 21:34:21]

Done.

+  window->set_id(0);
+  window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
+  window->Init(ui::LAYER_TEXTURED);
+  window->Show();
+
+  TestBrowserWindowAura* browser_window = new TestBrowserWindowAura(window);
+  browser_window->CreateBrowser(params);
+  new TestBrowserWindowOwner(browser_window);
+
+  return browser_window->browser();
+}
+#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(aura::Window* native_window)
+    : native_window_(native_window) {
+}
+
+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();
+}
+
+Browser* TestBrowserWindowAura::browser() {
+  return browser_;
+}
+
+void TestBrowserWindowAura::CreateBrowser(const Browser::CreateParams& params) {
+  Browser::CreateParams create_params = params;
+  create_params.window = this;
+  browser_ = new Browser(create_params);
+}
+
+#endif