Index: ash/wm/workspace/workspace_window_resizer.h |
diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h |
index 5acaf8e5b0ddab5b57c252fb5e762a5c97f72079..1344f57c6751d3f5b26555319d479e6712dec317 100644 |
--- a/ash/wm/workspace/workspace_window_resizer.h |
+++ b/ash/wm/workspace/workspace_window_resizer.h |
@@ -74,9 +74,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
const std::vector<aura::Window*>& attached_windows); |
private: |
- FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, CancelSnapPhantom); |
- FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomSnapMaxSize); |
- FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomWindowShow); |
+ friend class WorkspaceWindowResizerTest; |
// Returns the final bounds to place the window at. This differs from |
// the current when snapping. |
@@ -221,6 +219,9 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
// gets dragged into another browser window. |
base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_; |
+ // Current instance for use by the WorkspaceWindowResizerTest. |
+ static WorkspaceWindowResizer* instance_; |
+ |
DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer); |
}; |