Start the move of launcher_types.h to shelf.

chrome/browser/ui/ash/launcher/launcher_favicon_loader_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 "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 
-#include "ash/launcher/launcher_types.h"
+#include "ash/shelf/shelf_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 using content::WebContents;
 using content::WebContentsObserver;
 
 namespace {
 
 // Observer class to determine when favicons have completed loading.
 class ContentsObserver : public WebContentsObserver {
  public:
   explicit ContentsObserver(WebContents* web_contents)
@@ skipping 124 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html"));
   EXPECT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   // When multiple favicons are present, the correctly sized icon should be
-  // chosen. The icons are sized assuming ash::kLauncherPreferredSize < 128.
-  EXPECT_GT(128, ash::kLauncherPreferredSize);
+  // chosen. The icons are sized assuming ash::kShelfPreferredSize < 128.
+  EXPECT_GT(128, ash::kShelfPreferredSize);
   EXPECT_EQ(48, favicon_loader_->GetFavicon().height());
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ChangeLauncherIcons) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html"));
   EXPECT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   EXPECT_EQ(48, favicon_loader_->GetFavicon().height());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   ASSERT_TRUE(NavigateTo("launcher-smallfavicon.html"));
   ASSERT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_TRUE(favicon_loader_->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));
   ASSERT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader_->GetFavicon().height());
 }