chromeos: Move files in //ash/common to //ash, part 2

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>
 
-#include "ash/common/shelf/shelf_constants.h"
+#include "ash/shelf/shelf_constants.h"
 #include "base/macros.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 "net/test/embedded_test_server/embedded_test_server.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 158 matching lines @@
   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());
 }