Converts ash to use aura-mus

ash/mus/bridge/wm_window_mus_test_api.h

Index: ash/mus/bridge/wm_window_mus_test_api.h
diff --git a/ash/mus/bridge/wm_window_mus_test_api.h b/ash/mus/bridge/wm_window_mus_test_api.h
index aa064861aa1bc303ffc101cbe23bd7ffbd8e6c46..b346d84c0dcd2ecea112ba10a16575536c17c1e4 100644
--- a/ash/mus/bridge/wm_window_mus_test_api.h
+++ b/ash/mus/bridge/wm_window_mus_test_api.h
@@ -12,6 +12,22 @@ namespace mus {
 
 class WmWindowMusTestApi {
  public:
+  // Used by tests to set the default value of
+  // |WmWindowMus::default_use_empty_minimum_size_for_testing_|. This is needed
+  // as tests don't have a good way to reset the value of
+  // |use_empty_minimum_size_for_testing_| before the minimum size is queried.
+  class GlobalMinimumSizeLock {
+   public:
+    GlobalMinimumSizeLock();
+    ~GlobalMinimumSizeLock();
+
+   private:
+    // Number of instances of GlobalMinimumSizeLock that have been created.
+    static int instance_count_;
+
+    DISALLOW_COPY_AND_ASSIGN(GlobalMinimumSizeLock);
+  };
+
   explicit WmWindowMusTestApi(WmWindow* window)
       : WmWindowMusTestApi(WmWindowMus::AsWmWindowMus(window)) {}
   explicit WmWindowMusTestApi(WmWindowMus* window) : window_(window) {}
@@ -22,6 +38,8 @@ class WmWindowMusTestApi {
   }
 
  private:
+  static void SetDefaultUseEmptyMinimumSizeForTesting(bool value);
+
   WmWindowMus* window_;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindowMusTestApi);