ash: Clean up system background layer.

ash/shell_unittest.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 37 matching lines @@
       Shell::GetPrimaryRootWindow(),
       internal::kShellWindowId_AlwaysOnTopContainer);
 }
 
 // Expect ALL the containers!
 void ExpectAllContainers() {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_DesktopBackgroundContainer));
   EXPECT_TRUE(Shell::GetContainer(
-      root_window, internal::kShellWindowId_SystemBackgroundContainer));
-  EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_DefaultContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_AlwaysOnTopContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_PanelContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_LauncherContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_SystemModalContainer));
   EXPECT_TRUE(Shell::GetContainer(
@@ skipping 276 matching lines @@
   std::vector<aura::Window*> results;
   while (window) {
     results.push_back(window);
     window = window->parent();
   }
   return results;
 }
 
 }  // namespace
 
-// The SystemBackgroundContainer needs to be behind the
-// DesktopBackgroundContainer, otherwise workspace animations don't line up.
-TEST_F(ShellTest, SystemBackgroundBehindDesktopBackground) {
-  aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
-  aura::Window* desktop = Shell::GetContainer(
-      root_window, internal::kShellWindowId_DesktopBackgroundContainer);
-  ASSERT_TRUE(desktop != NULL);
-  aura::Window* system_bg = Shell::GetContainer(
-      root_window, internal::kShellWindowId_SystemBackgroundContainer);
-  ASSERT_TRUE(system_bg != NULL);
-
-  std::vector<aura::Window*> desktop_parents(BuildPathToRoot(desktop));
-  std::vector<aura::Window*> system_bg_parents(BuildPathToRoot(system_bg));
-
-  for (size_t i = 0; i < system_bg_parents.size(); ++i) {
-    std::vector<aura::Window*>::iterator desktop_i =
-        std::find(desktop_parents.begin(), desktop_parents.end(),
-                  system_bg_parents[i]);
-    if (desktop_i != desktop_parents.end()) {
-      // Found the common parent.
-      ASSERT_NE(0u, i);
-      ASSERT_TRUE(desktop_i != desktop_parents.begin());
-      aura::Window* common_parent = system_bg_parents[i];
-      int system_child = static_cast<int>(std::find(
-          common_parent->children().begin(),
-          common_parent->children().end(), system_bg_parents[i - 1]) -
-          common_parent->children().begin());
-      int desktop_child = static_cast<int>(std::find(
-          common_parent->children().begin(),
-          common_parent->children().end(), *(desktop_i - 1)) -
-          common_parent->children().begin());
-      EXPECT_LT(system_child, desktop_child);
-      return;
-    }
-  }
-  EXPECT_TRUE(false) <<
-      "system background and desktop background need to have a common parent";
-}
-
 // Various assertions around IsAutoHideMenuHideChecked() and
 // ToggleAutoHideMenu().
 TEST_F(ShellTest, ToggleAutoHide) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_TEXTURED);
   window->SetParent(NULL);
   window->Show();
   wm::ActivateWindow(window.get());
@@ skipping 40 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash