aura: Do not include test code in production code.

ui/aura/window.h

Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index ec19ae47e64b07a85f17c2cf78bac31e8e7e3024..6a2a49ddb2e5fc9f56fb2078d4d9cca27c3cf493 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -50,6 +50,10 @@ class WindowObserver;
 template<typename T>
 struct WindowProperty;
 
+namespace test {
+class WindowTestApi;
+}
+
 // Aura window implementation. Interesting events are sent to the
 // WindowDelegate.
 // TODO(beng): resolve ownership.
@@ -60,21 +64,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
  public:
   typedef std::vector<Window*> Windows;
 
-  class AURA_EXPORT TestApi {
-   public:
-    explicit TestApi(Window* window);
-
-    bool OwnsLayer() const;
-    bool ContainsMouse();
-
-   private:
-    TestApi();
-
-    Window* window_;
-
-    DISALLOW_COPY_AND_ASSIGN(TestApi);
-  };
-
   explicit Window(WindowDelegate* delegate);
   virtual ~Window();
 
@@ -359,6 +348,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
 #endif
 
  private:
+  friend class test::WindowTestApi;
   friend class LayoutManager;
 
   // Used when stacking windows.