Adds the option of aligning the launcher to the left or right. There

chrome/browser/ui/views/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 <vector>
 
 #include "base/file_path.h"
 #include "base/time.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
@@ skipping 148 matching lines @@
   ASSERT_TRUE(test_server()->Start());
   Browser* panel_browser;
   ASSERT_NO_FATAL_FAILURE(
       CreatePanelBrowser("launcher-manyfavicon.html", &panel_browser));
   LauncherFaviconLoader* favicon_loader = GetFaviconLoader(panel_browser);
   ASSERT_NE(static_cast<LauncherFaviconLoader*>(NULL), favicon_loader);
 
   EXPECT_TRUE(WaitForFaviconDownlads(3));
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   // When multiple favicons are present, the correctly sized icon should be
-  // chosen. The icons are sized assuming ash::kLauncherPreferredHeight < 128.
-  EXPECT_GT(128, ash::kLauncherPreferredHeight);
+  // chosen. The icons are sized assuming ash::kLauncherPreferredSize < 128.
+  EXPECT_GT(128, ash::kLauncherPreferredSize);
   EXPECT_EQ(48, favicon_loader->GetFavicon().height());
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ChangeLauncherIcons) {
   ASSERT_TRUE(test_server()->Start());
   Browser* panel_browser;
   ASSERT_NO_FATAL_FAILURE(
       CreatePanelBrowser("launcher-manyfavicon.html", &panel_browser));
   LauncherFaviconLoader* favicon_loader = GetFaviconLoader(panel_browser);
   ASSERT_NE(static_cast<LauncherFaviconLoader*>(NULL), favicon_loader);
 
   EXPECT_TRUE(WaitForFaviconDownlads(3));
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(48, favicon_loader->GetFavicon().height());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   NavigateTo(panel_browser, "launcher-smallfavicon.html");
   EXPECT_TRUE(WaitForFaviconDownlads(1));
   EXPECT_TRUE(favicon_loader->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   NavigateTo(panel_browser, "launcher-largefavicon.html");
   EXPECT_TRUE(WaitForFaviconDownlads(1));
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader->GetFavicon().height());
 }