DevTools: Fix content_shell devtools built in debug_devtools=1 mode

Source/devtools/devtools.gyp

Index: Source/devtools/devtools.gyp
diff --git a/Source/devtools/devtools.gyp b/Source/devtools/devtools.gyp
index 91920c0579aae5cef057758326b8a891b03ff399..175749ede67bcf867f6e56286400fbcd608f460f 100644
--- a/Source/devtools/devtools.gyp
+++ b/Source/devtools/devtools.gyp
@@ -118,7 +118,10 @@
                     'actions': [{
                         'action_name': 'generate_devtools_grd',
                         'script_name': 'scripts/generate_devtools_grd.py',
-                        'relative_path_dir': '<(PRODUCT_DIR)/resources/inspector',
+                        'relative_path_dirs': [
+                            '<(PRODUCT_DIR)/resources/inspector',
+                            'front_end'
+                        ],
                         'input_pages': [
                             '<(PRODUCT_DIR)/resources/inspector/devtools.html',
                             '<(PRODUCT_DIR)/resources/inspector/Main.js',
@@ -141,6 +144,7 @@
                             '<(PRODUCT_DIR)/resources/inspector/inspector.css',
                             '<(PRODUCT_DIR)/resources/inspector/devtools_extension_api.js',
                             '<@(devtools_standalone_files)',
+                            '<@(devtools_cm_css_files)',
                         ],
                         'images': [
                             '<@(devtools_image_files)',
@@ -154,7 +158,7 @@
                             'front_end/Images',
                         ],
                         'outputs': ['<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd'],
-                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dir', '<@(_relative_path_dir)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
+                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dirs', '<@(_relative_path_dirs)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
                     }],
                 },
                 {
@@ -165,7 +169,11 @@
                     'actions': [{
                         'action_name': 'generate_devtools_grd',
                         'script_name': 'scripts/generate_devtools_grd.py',
-                        'relative_path_dir': 'front_end',
+                        'relative_path_dirs': [
+                            'front_end',
+                            '<(PRODUCT_DIR)/resources/inspector',
+                            '<(SHARED_INTERMEDIATE_DIR)/blink',
+                        ],
                         'input_pages': [
                             '<@(all_devtools_files)',
                             '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendCommands.js',
@@ -185,7 +193,7 @@
                         ],
                         # Note that other files are put under /devtools directory, together with declared devtools_resources.grd
                         'outputs': ['<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd'],
-                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dir', '<@(_relative_path_dir)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
+                        'action': ['python', '<@(_script_name)', '<@(_input_pages)', '--relative_path_dirs', '<@(_relative_path_dirs)', '--images', '<@(_images_path)', '--output', '<@(_outputs)'],
                     }],
                 }],
             ],
@@ -540,11 +548,19 @@
                         'inputs': [
                             '<@(_script_name)',
                             '<@(devtools_source_frame_js_files)',
-                            '<@(devtools_cm_files)',
+                            '<@(devtools_cm_js_files)',
                         ],
                         'outputs': ['<(PRODUCT_DIR)/resources/inspector/source_frame/SourceFrame.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
                     }],
+                    'copies': [
+                        {
+                            'destination': '<(PRODUCT_DIR)/resources/inspector/cm',
+                            'files': [
+                                '<@(devtools_cm_css_files)',
+                            ],
+                        }
+                    ],
                 },
                 { # Debug
                     'copies': [
@@ -558,7 +574,8 @@
                         {
                             'destination': '<(PRODUCT_DIR)/resources/inspector/cm',
                             'files': [
-                                '<@(devtools_cm_files)',
+                                '<@(devtools_cm_js_files)',
+                                '<@(devtools_cm_css_files)',
                             ],
                         }
                     ]
@@ -865,31 +882,13 @@
                         'action_name': 'concatenated_module_descriptors',
                         'script_name': 'scripts/concatenate_module_descriptors.py',
                         'input_file': ['front_end/common/modules.js'],
-                        'module_json_files': [
-                            'front_end/audits/module.json',
-                            'front_end/components/module.json',
-                            'front_end/console/module.json',
-                            'front_end/devices/module.json',
-                            'front_end/elements/module.json',
-                            'front_end/extensions/module.json',
-                            'front_end/layers/module.json',
-                            'front_end/main/module.json',
-                            'front_end/network/module.json',
-                            'front_end/profiler/module.json',
-                            'front_end/resources/module.json',
-                            'front_end/search/module.json',
-                            'front_end/settings/module.json',
-                            'front_end/source_frame/module.json',
-                            'front_end/sources/module.json',
-                            'front_end/timeline/module.json',
-                        ],
                         'inputs': [
                             '<@(_script_name)',
                             '<@(_input_file)',
-                            '<@(_module_json_files)',
+                            '<@(devtools_module_json_files)',
                         ],
                         'outputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/common/modules.js'],
-                        'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)', '<@(_module_json_files)'],
+                        'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)', '<@(devtools_module_json_files)'],
                     }],
                 },
             ],