Move some extensions renderer tests into extensions_unittests.

BUG=348066,397166
TEST=extensions_unittests
R=jamescook@chromium.org
TBR=yoz@chromium.org

Review URL: https://codereview.chromium.org/477723005

Cr-Commit-Position: refs/heads/master@{#290184}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290184 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_tests_unit.gypi

@@ -558,8 +558,6 @@
         '../extensions/common/permissions/permissions_data_unittest.cc',
         '../extensions/common/url_pattern_set_unittest.cc',
         '../extensions/common/url_pattern_unittest.cc',
-        '../extensions/renderer/activity_log_converter_strategy_unittest.cc',
-        '../extensions/renderer/script_context_set_unittest.cc',
         # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
         # dependency is needed to make commit bots run unit_tests on
         # histograms.xml changes.
@@ -2106,7 +2104,6 @@
             ['exclude', '^utility/media_galleries/'],
           ],
           'sources!': [
-            '../extensions/renderer/activity_log_converter_strategy_unittest.cc',
             'browser/extensions/active_script_controller_unittest.cc',
             'browser/extensions/active_tab_unittest.cc',
             'browser/extensions/extension_context_menu_model_unittest.cc',

extensions/BUILD.gn

@@ -139,6 +139,7 @@ test("unittests") {
     "common/one_shot_event_unittest.cc",
     "common/permissions/manifest_permission_set_unittest.cc",
     "common/user_script_unittest.cc",
+    "renderer/activity_log_converter_strategy_unittest.cc",
     "renderer/api/serial/serial_api_unittest.cc",
     "renderer/api_test_base.cc",
     "renderer/api_test_base.h",
@@ -150,6 +151,7 @@ test("unittests") {
     "renderer/module_system_test.h",
     "renderer/module_system_unittest.cc",
     "renderer/safe_builtins_unittest.cc",
+    "renderer/script_context_set_unittest.cc",
     "renderer/utils_unittest.cc",
     "test/extensions_unittests_main.cc",
     "test/test_extensions_client.cc",

extensions/extensions.gyp

@@ -884,6 +884,7 @@
         'common/one_shot_event_unittest.cc',
         'common/permissions/manifest_permission_set_unittest.cc',
         'common/user_script_unittest.cc',
+        'renderer/activity_log_converter_strategy_unittest.cc',
         'renderer/api/serial/serial_api_unittest.cc',
         'renderer/api_test_base.cc',
         'renderer/api_test_base.h',
@@ -895,6 +896,7 @@
         'renderer/module_system_test.h',
         'renderer/module_system_unittest.cc',
         'renderer/safe_builtins_unittest.cc',
+        'renderer/script_context_set_unittest.cc',
         'renderer/utils_unittest.cc',
         'test/extensions_unittests_main.cc',
         'test/test_extensions_client.cc',