Makes Env contain a ContextFactory

ui/views/test/test_views_delegate.cc

Index: ui/views/test/test_views_delegate.cc
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index 7a4b78d8487432122f6b870a537301b56e09300e..0d437ea64e28ba23611cfd3e9de14abddadbde39 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -15,11 +15,7 @@ namespace views {
 
 TestViewsDelegate::TestViewsDelegate()
     : use_desktop_native_widgets_(false),
-      use_transparent_windows_(false)
-#if defined(USE_AURA)
-      , context_factory_(NULL)
-#endif
-      {
+      use_transparent_windows_(false) {
   DCHECK(!ViewsDelegate::views_delegate);
   ViewsDelegate::views_delegate = this;
 #if defined(USE_AURA)
@@ -46,10 +42,4 @@ void TestViewsDelegate::OnBeforeWidgetInit(
 #endif  // !defined(OS_CHROMEOS)
 }
 
-#if defined(USE_AURA)
-ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
-  return context_factory_;
-}
-#endif
-
 }  // namespace views