Fix DownloadTests and change cros/aura to use shelf

chrome/browser/ui/views/frame/browser_view.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 611 matching lines @@
 
   // The TabStrip.
   AbstractTabStripView* tabstrip_;
 
   // The Toolbar containing the navigation buttons, menus and the address bar.
   ToolbarView* toolbar_;
 
   // The Bookmark Bar View for this window. Lazily created.
   scoped_ptr<BookmarkBarView> bookmark_bar_view_;
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
   // The download shelf view (view at the bottom of the page).  ChromiumOS
   // uses ActiveDownloadsUI instead.
   scoped_ptr<DownloadShelfView> download_shelf_;
 #endif
 
   // The InfoBarContainerView that contains InfoBars for the current tab.
   InfoBarContainerView* infobar_container_;
 
   // The view that contains sidebar for the current tab.
   TabContentsContainer* sidebar_container_;
@@ skipping 81 matching lines @@
   // If this flag is set then SetFocusToLocationBar() will set focus to the
   // location bar even if the browser window is not active.
   bool force_location_bar_focus_;
 
   PendingFullscreenRequest fullscreen_request_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_