Changes code using Compositor to pass in ContextFactory

ash/test/ash_test_base.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 ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 15 matching lines @@
 namespace aura {
 class RootWindow;
 class Window;
 class WindowDelegate;
 
 namespace test {
 class EventGenerator;
 }  // namespace test
 }  // namespace aura
 
+namespace ui {
+class ContextFactory;
+}
+
 namespace ash {
 class DisplayManager;
 
 namespace test {
 
 class AshTestHelper;
 class TestScreenshotDelegate;
 class TestSystemTrayDelegate;
 #if defined(OS_WIN)
 class TestMetroViewerProcessHost;
@@ skipping 35 matching lines @@
       const gfx::Rect& bounds);
 
   // Attach |window| to the current shell's root window.
   void ParentWindowInPrimaryRootWindow(aura::Window* window);
 
   // Returns the EventGenerator that uses screen coordinates and works
   // across multiple displays. It createse a new generator if it
   // hasn't been created yet.
   aura::test::EventGenerator& GetEventGenerator();
 
+  ui::ContextFactory* context_factory();
+
  protected:
   enum UserSessionBlockReason {
     FIRST_BLOCK_REASON,
     BLOCKED_BY_LOCK_SCREEN = FIRST_BLOCK_REASON,
     BLOCKED_BY_LOGIN_SCREEN,
     BLOCKED_BY_USER_ADDING_SCREEN,
     NUMBER_OF_BLOCK_REASONS
   };
 
   // Proxy to AshTestHelper::SupportsMultipleDisplays().
@@ skipping 51 matching lines @@
   virtual ~NoSessionAshTestBase() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_