mash: Remove ShelfDelegate; move functions to ShelfModel.

chrome/test/base/browser_with_test_window_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 
 #include "base/at_exit.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 89 matching lines @@
   }
 
   TestingProfile* profile() const { return profile_; }
 
   TestingProfile* GetProfile() { return profile_; }
 
   BrowserWindow* release_browser_window() WARN_UNUSED_RESULT {
     return window_.release();
   }
 
+#if defined(OS_CHROMEOS)
+  ash::test::AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }
+#endif
+
   // The context to help determine desktop type when creating new Widgets.
   gfx::NativeWindow GetContext();
 
   // Adds a tab to |browser| with the given URL and commits the load.
   // This is a convenience function. The new tab will be added at index 0.
   void AddTab(Browser* browser, const GURL& url);
 
   // Commits the pending load on the given controller. It will keep the
   // URL of the pending load. If there is no pending load, this does nothing.
   void CommitPendingLoad(content::NavigationController* controller);
@@ skipping 76 matching lines @@
   // The type of browser to create (tabbed or popup).
   Browser::Type browser_type_;
 
   // Whether the browser is part of a hosted app.
   bool hosted_app_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_