Revert 110765 - Fix DownloadTests and change cros/aura to use shelf

chrome/browser/ui/views/frame/browser_view_layout.cc

Index: chrome/browser/ui/views/frame/browser_view_layout.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view_layout.cc	(revision 110765)
+++ chrome/browser/ui/views/frame/browser_view_layout.cc	(working copy)
@@ -22,7 +22,7 @@
 #include "ui/gfx/size.h"
 #include "views/controls/single_split_view.h"
 
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
@@ -231,7 +231,7 @@
       infobar_container_ = view;
       break;
     case VIEW_ID_DOWNLOAD_SHELF:
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#if !defined(OS_CHROMEOS)
       download_shelf_ = static_cast<DownloadShelfView*>(view);
 #else
       NOTREACHED();
@@ -514,7 +514,7 @@
 }
 
 int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#if !defined(OS_CHROMEOS)
   // Re-layout the shelf either if it is visible or if it's close animation
   // is currently running.  ChromiumOS uses ActiveDownloadsUI instead of
   // DownloadShelf.