ash: Remove ash::Shelf in favor of ash::WmShelf

chrome/browser/ui/ash/shelf_browsertest.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/aura/wm_window_aura.h"
-#include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
 typedef InProcessBrowserTest ShelfBrowserTest;
 
 // Confirm that a status bubble doesn't cause the shelf to darken.
 IN_PROC_BROWSER_TEST_F(ShelfBrowserTest, StatusBubble) {
   ash::ShelfLayoutManager* shelf_layout_manager =
-      ash::Shelf::ForWindow(
+      ash::WmShelf::ForWindow(
           ash::WmWindowAura::Get(browser()->window()->GetNativeWindow()))
           ->shelf_layout_manager();
   EXPECT_TRUE(shelf_layout_manager->IsVisible());
 
   // Ensure that the browser abuts the shelf.
   gfx::Rect bounds = browser()->window()->GetBounds();
   bounds.set_height(shelf_layout_manager->GetIdealBounds().y() - bounds.y());
   browser()->window()->SetBounds(bounds);
   EXPECT_FALSE(shelf_layout_manager->window_overlaps_shelf());
 
   // Show status, which may overlap the shelf by a pixel.
   browser()->window()->GetStatusBubble()->SetStatus(
       base::UTF8ToUTF16("Dummy Status Text"));
   shelf_layout_manager->UpdateVisibilityState();
 
   // Ensure that status doesn't cause overlap.
   EXPECT_FALSE(shelf_layout_manager->window_overlaps_shelf());
 
   // Ensure that moving the browser slightly down does cause overlap.
   bounds.Offset(0, 1);
   browser()->window()->SetBounds(bounds);
   EXPECT_TRUE(shelf_layout_manager->window_overlaps_shelf());
 }