Touch constants and dead code removal.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index dd9f6791f8211d33bca765500d3bb305af516c3f..51655428fd4a9499cc25e3ad85c48374b3ff9163 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -653,14 +653,7 @@ std::string ChromeContentBrowserClient::GetAcceptLangs(
 
 SkBitmap* ChromeContentBrowserClient::GetDefaultFavicon() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-#if defined(TOUCH_UI)
-  // In touch builds, we want large default favicons for the tabstrip, but in
-  // other places (such as bookmark, manage search engines, homepage) we assume
-  // default favicons are 16x16.
-  return rb.GetBitmapNamed(IDR_DEFAULT_LARGE_FAVICON);
-#else
   return rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
-#endif
 }
 
 bool ChromeContentBrowserClient::AllowAppCache(