Changes code using Compositor to pass in ContextFactory

chrome/test/base/browser_with_test_window_test.h

Index: chrome/test/base/browser_with_test_window_test.h
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index cc5cde80548aef59987322644247f49fa8130933..d46dfda92f8f707dd99da78f1cd1b037ccf91e0f 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -41,6 +41,9 @@ namespace test {
 class AuraTestHelper;
 }
 }
+namespace ui {
+class ContextFactory;
+}
 #endif
 
 #if defined(TOOLKIT_VIEWS)
@@ -161,7 +164,8 @@ class BrowserWithTestWindowTest : public testing::Test {
 #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.
@@ -185,10 +189,9 @@ class BrowserWithTestWindowTest : public testing::Test {
   // 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