Revert of Revert "Revert of content: Fix Context creation logic in ContextProviderFactoryImpl."

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 101 matching lines @@
       'test/dwrite_font_fake_sender_win.cc',
       'test/dwrite_font_fake_sender_win.h',
       'test/fake_compositor_dependencies.cc',
       'test/fake_compositor_dependencies.h',
       'test/fake_plugin_service.cc',
       'test/fake_plugin_service.h',
       'test/mock_background_sync_controller.cc',
       'test/mock_background_sync_controller.h',
       'test/mock_google_streaming_server.cc',
       'test/mock_google_streaming_server.h',
-      'test/mock_gpu_channel_establish_factory.cc',
-      'test/mock_gpu_channel_establish_factory.h',
       'test/mock_keyboard.cc',
       'test/mock_keyboard.h',
       'test/mock_keyboard_driver_win.cc',
       'test/mock_keyboard_driver_win.h',
       'test/mock_permission_manager.cc',
       'test/mock_permission_manager.h',
       'test/mock_render_process.cc',
       'test/mock_render_process.h',
       'test/mock_ssl_host_state_delegate.cc',
       'test/mock_ssl_host_state_delegate.h',
@@ skipping 1795 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }