Start the move of launcher_types.h to shelf.

chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
index cbeb26d97a2e712f22f212fddc96512ebac37478..546489fbbae49988536335871c7f5e365308e038 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
@@ -4,7 +4,7 @@
 
 #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"
@@ -13,6 +13,7 @@
 #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;
@@ -157,8 +158,8 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) {
 
   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());
 }