Fix the content_browsertests everywhere maybe.

ui/aura/client/stacking_client.cc

Index: ui/aura/client/stacking_client.cc
diff --git a/ui/aura/client/stacking_client.cc b/ui/aura/client/stacking_client.cc
index 2bab5210618ec78eaecd32e10e403f940d81e746..5d93d9848403fa6227c322562af251c670b5a407 100644
--- a/ui/aura/client/stacking_client.cc
+++ b/ui/aura/client/stacking_client.cc
@@ -16,34 +16,22 @@ namespace client {
 DEFINE_WINDOW_PROPERTY_KEY(
     StackingClient*, kRootWindowStackingClientKey, NULL);
 
-void SetStackingClient(StackingClient* stacking_client) {
-  Env::GetInstance()->set_stacking_client(stacking_client);
-}
-
-StackingClient* GetStackingClient() {
-  return Env::GetInstance()->stacking_client();
-}
-
 void SetStackingClient(Window* window, StackingClient* stacking_client) {
-  if (window) {
-    RootWindow* root_window = window->GetRootWindow();
-    DCHECK(root_window);
-    root_window->SetProperty(kRootWindowStackingClientKey, stacking_client);
-  } else {
-    SetStackingClient(stacking_client);
-  }
+  DCHECK(window);
+
+  RootWindow* root_window = window->GetRootWindow();
+  DCHECK(root_window);
+  root_window->SetProperty(kRootWindowStackingClientKey, stacking_client);
 }
 
 StackingClient* GetStackingClient(Window* window) {
-  if (window) {
-    RootWindow* root_window = window->GetRootWindow();
-    DCHECK(root_window);
-    StackingClient* root_window_stacking_client =
-        root_window->GetProperty(kRootWindowStackingClientKey);
-    if (root_window_stacking_client)
-      return root_window_stacking_client;
-  }
-  return GetStackingClient();
+  DCHECK(window);
+  RootWindow* root_window = window->GetRootWindow();
+  DCHECK(root_window);
+  StackingClient* root_window_stacking_client =
+      root_window->GetProperty(kRootWindowStackingClientKey);
+  DCHECK(root_window_stacking_client);
+  return root_window_stacking_client;
 }
 
 }  // namespace client