Fix the browser match rules.

chrome/test/base/test_browser_window.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
 #define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/test_download_shelf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
+#include "ui/aura/window.h"

[msw, 2015/07/07 18:11:55]

nit: limit to #if defined(USE_AURA) (or add test_browser_window_aura files)

[xdai1, 2015/07/08 00:26:22]

Done.

 
 class LocationBarTesting;
 class OmniboxView;
 
 namespace extensions {
 class Extension;
 }
 
 // An implementation of BrowserWindow used for testing. TestBrowserWindow only
 // contains a valid LocationBar, all other getters return NULL.
@@ skipping 167 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow);
 };
 
 namespace chrome {
 
 // Helper that handle the lifetime of TestBrowserWindow instances.
 Browser* CreateBrowserWithTestWindowForParams(Browser::CreateParams* params);
 
 }  // namespace chrome
 
+#if defined(USE_AURA)

[msw, 2015/07/07 18:11:55]

nit: order this before CreateBrowserWithTestWindowForParams

[xdai1, 2015/07/08 00:26:22]

Done.

+// A browser window proxy which is able to associate an aura native window with

[msw, 2015/07/07 18:11:55]

nit: // A browser window proxy with an associated Aura native window.

[xdai1, 2015/07/08 00:26:21]

Done.

+// it.
+class TestBrowserWindowAura : public TestBrowserWindow {
+ public:
+  // |native_window| will still be owned by the caller after the constructor

[msw, 2015/07/07 18:11:55]

nit: // The caller retains ownership of |native_window|.

[xdai1, 2015/07/08 00:26:22]

Sorry I think I made a mistake here. I think |native_window| is owned by the
class TestBrowserWindowAura?

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

Ah, that does seem to be the case.

+  // was called.
+  explicit TestBrowserWindowAura(aura::Window* native_window);
+  ~TestBrowserWindowAura() override;
+
+  // TestBrowserWindow overrides:
+  gfx::NativeWindow GetNativeWindow() const override;
+  void Show() override;
+  void Hide() override;
+  gfx::Rect GetBounds() const override;
+
+  Browser* browser();
+  void CreateBrowser(const Browser::CreateParams& params);
+
+ private:
+  scoped_ptr<Browser> browser_;
+  scoped_ptr<aura::Window> native_window_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura);
+};
+
+// Helper that create a test browser window which has a native window.

[msw, 2015/07/07 18:11:55]

nit: creates

[xdai1, 2015/07/08 00:26:21]

Done.

+scoped_ptr<TestBrowserWindowAura> CreateBrowserWithNativeWindowForParams(

[msw, 2015/07/07 18:11:55]

nit: maybe return a Browser* like CreateBrowserWithTestWindowForParams and call
this CreateBrowserWithAuraTestWindowForParams?

[msw, 2015/07/07 18:11:55]

nit: move this into the chrome namespace, and order it just after
CreateBrowserWithTestWindowForParams

[xdai1, 2015/07/08 00:26:22]

Done.

[xdai1, 2015/07/08 00:26:22]

Done.

+    const Browser::CreateParams& params);
+#endif  // defined(USE_AURA)
+
 #endif  // CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_