Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 40 matching lines @@
         # they're only used by content) or content/public/test (if they're used
         # by other embedders).
         'browser/download/mock_download_file.cc',
         'browser/download/mock_download_file.h',
         'browser/geolocation/arbitrator_dependency_factories_for_test.cc',
         'browser/geolocation/arbitrator_dependency_factories_for_test.h',
         'browser/geolocation/fake_access_token_store.cc',
         'browser/geolocation/fake_access_token_store.h',
         'browser/geolocation/mock_location_provider.cc',
         'browser/geolocation/mock_location_provider.h',
-        'browser/mock_content_browser_client.cc',
-        'browser/mock_content_browser_client.h',
         'browser/renderer_host/media/mock_media_observer.cc',
         'browser/renderer_host/media/mock_media_observer.h',
         'browser/renderer_host/test_backing_store.cc',
         'browser/renderer_host/test_backing_store.h',
         'browser/renderer_host/test_render_view_host.cc',
         'browser/renderer_host/test_render_view_host.h',
         'browser/web_contents/test_web_contents.cc',
         'browser/web_contents/test_web_contents.h',
         'common/test_url_constants.cc',
         'common/test_url_constants.h',
@@ skipping 22 matching lines @@
         'test/mock_render_process.h',
         'test/mock_render_process_host.cc',
         'test/mock_render_thread.cc',
         'test/mock_resource_context.cc',
         'test/net/url_request_abort_on_end_job.cc',
         'test/net/url_request_abort_on_end_job.h',
         'test/render_view_fake_resources_test.cc',
         'test/render_view_test.cc',
         'test/test_browser_context.cc',
         'test/test_browser_thread.cc',
+        'test/test_content_browser_client.cc',
+        'test/test_content_browser_client.h',
         'test/test_content_client.cc',
         'test/test_content_client.h',
         'test/test_content_client_initializer.cc',
         'test/test_file_error_injector.cc',
         'test/test_navigation_observer.cc',
         'test/test_notification_tracker.cc',
         'test/test_renderer_host.cc',
         'test/test_render_view_host_factory.cc',
         'test/test_render_view_host_factory.h',
         'test/test_url_fetcher_factory.cc',
@@ skipping 470 matching lines @@
               '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
               '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }