Makes Env contain a ContextFactory

ui/views/test/test_views_delegate.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_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/views_delegate.h"
 
@@ skipping 12 matching lines @@
   // DesktopNativeWidgetAura instead of whatever the default native widget would
   // be. This has no effect on ChromeOS.
   void set_use_desktop_native_widgets(bool desktop) {
     use_desktop_native_widgets_ = desktop;
   }
 
   void set_use_transparent_windows(bool transparent) {
     use_transparent_windows_ = transparent;
   }
 
-#if defined(USE_AURA)
-  void set_context_factory(ui::ContextFactory* context_factory) {
-    context_factory_ = context_factory;
-  }
-#endif
-
   // ViewsDelegate:
   virtual void OnBeforeWidgetInit(
       Widget::InitParams* params,
       internal::NativeWidgetDelegate* delegate) OVERRIDE;
-#if defined(USE_AURA)
-  virtual ui::ContextFactory* GetContextFactory() OVERRIDE;
-#endif
 
  private:
   bool use_desktop_native_widgets_;
 
   bool use_transparent_windows_;
 
 #if defined(USE_AURA)
   scoped_ptr<wm::WMState> wm_state_;
 
   ui::ContextFactory* context_factory_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_