Changes code using Compositor to pass in ContextFactory

ui/aura/test/aura_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 UI_AURA_TEST_AURA_TEST_BASE_H_
 #define UI_AURA_TEST_AURA_TEST_BASE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_helper.h"
 
+namespace ui {
+class ContextFactory;
+}
+
 namespace aura {
 class Window;
 class WindowDelegate;
 namespace test {
 
 // A base class for aura unit tests.
 // TODO(beng): Instances of this test will create and own a RootWindow.
 class AuraTestBase : public testing::Test {
  public:
   AuraTestBase();
   virtual ~AuraTestBase();
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // Creates a normal window parented to |parent|.
   aura::Window* CreateNormalWindow(int id, Window* parent,
                                    aura::WindowDelegate* delegate);
 
+  ui::ContextFactory* context_factory() { return context_factory_; }
+
  protected:
   void RunAllPendingInMessageLoop();
 
   void ParentWindow(Window* window);
 
   // A convenience function for dispatching an event to |dispatcher()|.
   // Returns whether |event| was handled.
   bool DispatchEventUsingWindowDispatcher(ui::Event* event);
 
   Window* root_window() { return helper_->root_window(); }
   WindowTreeHost* host() { return helper_->host(); }
   ui::EventProcessor* event_processor() { return helper_->event_processor(); }
   TestScreen* test_screen() { return helper_->test_screen(); }
 
  private:
   bool setup_called_;
   bool teardown_called_;
+  ui::ContextFactory* context_factory_;
   base::MessageLoopForUI message_loop_;
   scoped_ptr<AuraTestHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(AuraTestBase);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_AURA_TEST_BASE_H_