Clean up some ash constants.

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 <stdint.h>
 
 #include <memory>
 
@@ skipping 140 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) {
   ASSERT_TRUE(embedded_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::SHELF_SIZE < 128.
-  EXPECT_GT(128, ash::GetShelfConstant(ash::SHELF_SIZE));
+  // chosen. The icons are sized assuming ash::kShelfSize < 128.
+  EXPECT_GT(128, ash::kShelfSize);
   EXPECT_EQ(48, favicon_loader_->GetFavicon().height());
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ChangeLauncherIcons) {
   ASSERT_TRUE(embedded_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());
 }