Combine traits for IPC mutation and generation fuzzing plus other refactoring.

tools/ipc_fuzzer/mutate/mutate.gyp

Index: tools/ipc_fuzzer/mutate/mutate.gyp
diff --git a/tools/ipc_fuzzer/mutate/mutate.gyp b/tools/ipc_fuzzer/mutate/mutate.gyp
index e8e1b298f15df81d418006a3d103b4583a828568..a21396b3b62b5da1210d88c823bca1cd9f0f0b30 100644
--- a/tools/ipc_fuzzer/mutate/mutate.gyp
+++ b/tools/ipc_fuzzer/mutate/mutate.gyp
@@ -8,48 +8,26 @@
   },
   'targets': [
     {
-      'target_name': 'ipc_fuzzer_mutate',
+      'target_name': 'ipc_fuzzer',
       'type': 'executable',
       'dependencies': [
         '../message_lib/message_lib.gyp:ipc_message_lib',
       ],
       'sources': [
-        'mutate.cc',
+        'fuzzer.h',
+        'fuzzer.cc',
+        'fuzzer_main.cc',
+        'generator.h',
+        'generator.cc',
+        'mutator.h',
+        'mutator.cc',
         'rand_util.h',
         'rand_util.cc',
       ],
       'conditions': [
         ['asan==1', {
           'cflags!': [
-            # Compiling mutate.cc with ASan takes too long, see
-            # http://crbug.com/360158.
-            '-fsanitize=address',
-            '-fsanitize-coverage=<(sanitizer_coverage)',
-          ],
-        }],
-      ],
-      'include_dirs': [
-        '../../..',
-      ],
-      'defines': [
-        'USE_CUPS',
-      ],
-    },
-    {
-      'target_name': 'ipc_fuzzer_generate',
-      'type': 'executable',
-      'dependencies': [
-        '../message_lib/message_lib.gyp:ipc_message_lib',
-      ],
-      'sources': [
-        'generate.cc',
-        'rand_util.h',
-        'rand_util.cc',
-      ],
-      'conditions': [
-        ['asan==1', {
-          'cflags!': [
-            # Compiling generate.cc with ASan takes too long, see
+            # Compiling fuzzer.cc with ASan takes too long, see
             # http://crbug.com/360158.
             '-fsanitize=address',
             '-fsanitize-coverage=<(sanitizer_coverage)',