Revert 149869 because it broke ash_unittests on win_aura and linux_chromeos.

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/ash_switches.h"
-#include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
@@ skipping 35 matching lines @@
       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(
-      root_window, internal::kShellWindowId_LockScreenBackgroundContainer));
-  EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_LockScreenContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_LockSystemModalContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_StatusContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_MenuContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_DragImageAndTooltipContainer));
   EXPECT_TRUE(Shell::GetContainer(
@@ skipping 193 matching lines @@
   // We have a default container event filter (for window drags).
   EXPECT_TRUE(GetDefaultContainer()->event_filter());
   // Launcher is visible.
   views::Widget* launcher_widget = shell->launcher()->widget();
   EXPECT_TRUE(launcher_widget->IsVisible());
   // Launcher is at bottom-left of screen.
   EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x());
   EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(),
             launcher_widget->GetWindowBoundsInScreen().bottom());
   // We have a desktop background but not a bare layer.
-  // TODO (antrim): enable once we find out why it fails component build.
-  //  internal::DesktopBackgroundWidgetController* background =
-  //      Shell::GetPrimaryRootWindow()->
-  //          GetProperty(internal::kWindowDesktopComponent);
-  //  EXPECT_TRUE(background);
-  //  EXPECT_TRUE(background->widget());
-  //  EXPECT_FALSE(background->layer());
+  EXPECT_TRUE(test_api.root_window_layout()->background_widget());
+  EXPECT_FALSE(test_api.root_window_layout()->background_layer());
 
   // Create a normal window.  It is not maximized.
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
   widget_params.bounds.SetRect(11, 22, 300, 400);
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
   EXPECT_FALSE(widget->IsMaximized());
 
   // Clean up.
@@ skipping 47 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