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..fc9b0fe8dc7b1160fd6722547e5cc40f1d7cda77 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 {
@@ -38,13 +37,40 @@ class TestBrowserWindowOwner : public chrome::BrowserListObserver {
 
 }  // 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(
+    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 =
+      new TestBrowserWindowAura(window.Pass());
+  new TestBrowserWindowOwner(browser_window);
+  return browser_window->CreateBrowser(params);
 }
 
+scoped_ptr<Browser> CreateBrowserForAuraTestWindowAndParams(
+    scoped_ptr<aura::Window> window,
+    const Browser::CreateParams& params) {
+  TestBrowserWindowAura* browser_window =
+      new TestBrowserWindowAura(window.Pass());
+  new TestBrowserWindowOwner(browser_window);
+  return browser_window->CreateBrowser(params);
+}
+
+#endif  // defined(USE_AURA)
+
 }  // namespace chrome
 
 
@@ -231,3 +257,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();
+}
+
+scoped_ptr<Browser> TestBrowserWindowAura::CreateBrowser(
+    const Browser::CreateParams& params) {
+  Browser::CreateParams create_params = params;
+  create_params.window = this;
+  browser_ = new Browser(create_params);
+  return make_scoped_ptr(browser_);
+}
+
+#endif