Fix the browser match rules.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 7b0d18fe2061913819184d5e5d6e023ee451f87a..ef3dbc10b2970766996a8701f336afc64f575a6e 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -618,51 +618,6 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
 };
 
 #if defined(OS_CHROMEOS)
-// A browser window proxy which is able to associate an aura native window with
-// it.
-class TestBrowserWindowAura : public TestBrowserWindow {
- public:
-  // |native_window| will still be owned by the caller after the constructor
-  // was called.
-  explicit TestBrowserWindowAura(aura::Window* native_window)
-      : native_window_(native_window) {
-  }
-  ~TestBrowserWindowAura() override {}
-
-  gfx::NativeWindow GetNativeWindow() const override {
-    return native_window_.get();
-  }
-
-  Browser* browser() { return browser_.get(); }
-
-  void CreateBrowser(const Browser::CreateParams& params) {
-    Browser::CreateParams create_params = params;
-    create_params.window = this;
-    browser_.reset(new Browser(create_params));
-  }
-
- private:
-  scoped_ptr<Browser> browser_;
-  scoped_ptr<aura::Window> native_window_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura);
-};
-
-// Creates a test browser window which has a native window.
-scoped_ptr<TestBrowserWindowAura> CreateTestBrowserWindow(
-    const Browser::CreateParams& params) {
-  // Create a window.
-  aura::Window* window = new aura::Window(NULL);
-  window->set_id(0);
-  window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window->Init(ui::LAYER_TEXTURED);
-  window->Show();
-
-  scoped_ptr<TestBrowserWindowAura> browser_window(
-      new TestBrowserWindowAura(window));
-  browser_window->CreateBrowser(params);
-  return browser_window.Pass();
-}
 
 // Watches WebContents and blocks until it is destroyed. This is needed for
 // the destruction of a V2 application.
@@ -1482,8 +1437,9 @@ TEST_F(MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest,
       multi_user_util::GetUserIDFromProfile(profile());
 
   // Create a browser window with a native window for the current user.
-  scoped_ptr<BrowserWindow> browser_window(CreateTestBrowserWindow(
-      Browser::CreateParams(profile(), chrome::HOST_DESKTOP_TYPE_ASH)));
+  scoped_ptr<BrowserWindow> browser_window(
+      CreateBrowserWithNativeWindowForParams(
+          Browser::CreateParams(profile(), chrome::HOST_DESKTOP_TYPE_ASH)));
   aura::Window* window = browser_window->GetNativeWindow();
   manager->SetWindowOwner(window, current_user);