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..e3cf6c8c5c983233f7d23e9fba666fa694fc40a2 100644
--- a/chrome/test/base/test_browser_window.cc
+++ b/chrome/test/base/test_browser_window.cc
@@ -13,36 +13,12 @@
 
 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));
 }
 
 }  // namespace chrome
@@ -219,8 +195,7 @@ web_modal::WebContentsModalDialogHost*
   return NULL;
 }
 
-int
-TestBrowserWindow::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
+int TestBrowserWindow::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
   return 0;
 }
 
@@ -231,3 +206,19 @@ void TestBrowserWindow::ExecuteExtensionCommand(
 ExclusiveAccessContext* TestBrowserWindow::GetExclusiveAccessContext() {
   return nullptr;
 }
+
+// TestBrowserWindowOwner -----------------------------------------------------
+
+TestBrowserWindowOwner::TestBrowserWindowOwner(TestBrowserWindow* window)
+    : window_(window) {
+  BrowserList::AddObserver(this);
+}
+
+TestBrowserWindowOwner::~TestBrowserWindowOwner() {
+  BrowserList::RemoveObserver(this);
+}
+
+void TestBrowserWindowOwner::OnBrowserRemoved(Browser* browser) {
+  if (browser->window() == window_.get())
+    delete this;
+}