Changes code using Compositor to pass in ContextFactory

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/message_loop/message_loop.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 23 matching lines @@
 }
 }
 #endif
 
 #if defined(USE_AURA)
 namespace aura {
 namespace test {
 class AuraTestHelper;
 }
 }
+namespace ui {
+class ContextFactory;
+}
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 namespace views {
 class ViewsDelegate;
 }
 #endif
 
 namespace content {
 class NavigationController;
@@ skipping 100 matching lines @@
   virtual Browser* CreateBrowser(Profile* profile,
                                  Browser::Type browser_type,
                                  bool hosted_app,
                                  chrome::HostDesktopType host_desktop_type,
                                  BrowserWindow* browser_window);
 
  private:
 #if !defined(OS_CHROMEOS) && defined(TOOLKIT_VIEWS)
   // Creates the ViewsDelegate to use, may be overriden to create a different
   // ViewsDelegate.
-  views::ViewsDelegate* CreateViewsDelegate();
+  views::ViewsDelegate* CreateViewsDelegate(
+      ui::ContextFactory* context_factory);
 #endif
 
   // We need to create a MessageLoop, otherwise a bunch of things fails.
   content::TestBrowserThreadBundle thread_bundle_;
   base::ShadowingAtExitManager at_exit_manager_;
 
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   chromeos::ScopedTestUserManager test_user_manager_;
 #endif
 
   // The profile will automatically be destroyed by TearDown using the
   // |DestroyProfile()| function - which can be overwritten by derived testing
   // frameworks.
   TestingProfile* profile_;
   scoped_ptr<BrowserWindow> window_;  // Usually a TestBrowserWindow.
   scoped_ptr<Browser> browser_;
 
   // The existence of this object enables tests via
   // RenderViewHostTester.
   content::RenderViewHostTestEnabler rvh_test_enabler_;
 
-#if defined(USE_ASH)
+#if defined(OS_CHROMEOS)
   scoped_ptr<ash::test::AshTestHelper> ash_test_helper_;
-#endif
-#if defined(USE_AURA)
+#elif defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   scoped_ptr<views::ViewsDelegate> views_delegate_;
 #endif
 
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   // The type of browser to create (tabbed or popup).
   Browser::Type browser_type_;
 
   // The desktop to create the initial window on.
   chrome::HostDesktopType host_desktop_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_