Fix the browser match rules.

chrome/test/base/test_browser_window.cc

Index: chrome/test/base/test_browser_window.cc
diff --git a/chrome/test/base/test_browser_window.cc b/chrome/test/base/test_browser_window.cc
index 8bfc54c0b946c7117030471a426adce64233eb70..2afa64cd4fa21ea37ef6dcd6b87620fe9fd72f79 100644
--- a/chrome/test/base/test_browser_window.cc
+++ b/chrome/test/base/test_browser_window.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "ui/gfx/geometry/rect.h"
 
-
 // Helpers --------------------------------------------------------------------
 
 namespace chrome {
@@ -45,6 +44,32 @@ Browser* CreateBrowserWithTestWindowForParams(Browser::CreateParams* params) {
   return new Browser(*params);
 }
 
+#if defined(USE_AURA)
+Browser* CreateBrowserWithAuraTestWindowForParams(
+    const Browser::CreateParams& params) {
+  scoped_ptr<aura::Window> window(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 =

[msw, 2015/07/08 23:58:00]

nit: if we keep this function, make it just call
CreateBrowserForAuraTestWindowAndParams here (instead of duplicating this code).

+      new TestBrowserWindowAura(window.Pass());
+  new TestBrowserWindowOwner(browser_window);
+  return browser_window->CreateBrowser(params);
+}
+
+Browser* CreateBrowserForAuraTestWindowAndParams(
+    scoped_ptr<aura::Window> window,
+    const Browser::CreateParams& params) {

[msw, 2015/07/08 23:58:00]

Should these functions take a params pointer, like
CreateBrowserWithTestWindowForParams?

+  TestBrowserWindowAura* browser_window =
+      new TestBrowserWindowAura(window.Pass());
+  new TestBrowserWindowOwner(browser_window);
+  return browser_window->CreateBrowser(params);
+}
+
+#endif  // defined(USE_AURA)
+
 }  // namespace chrome
 
 
@@ -231,3 +256,41 @@ void TestBrowserWindow::ExecuteExtensionCommand(
 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();
+}
+
+Browser* TestBrowserWindowAura::CreateBrowser(
+    const Browser::CreateParams& params) {
+  Browser::CreateParams create_params = params;
+  create_params.window = this;
+  browser_ = new Browser(create_params);
+  return browser_;
+}
+
+#endif