Restructure the ipc_fuzzer directory.

tools/ipc_fuzzer/message_tools/message_tools.gyp

Index: tools/ipc_fuzzer/message_tools/message_tools.gyp
diff --git a/tools/ipc_fuzzer/mutate/mutate.gyp b/tools/ipc_fuzzer/message_tools/message_tools.gyp
similarity index 51%
rename from tools/ipc_fuzzer/mutate/mutate.gyp
rename to tools/ipc_fuzzer/message_tools/message_tools.gyp
index a21396b3b62b5da1210d88c823bca1cd9f0f0b30..3ed2ac4d7f15b7dfc139a4b3ed6ecf06a0278188 100644
--- a/tools/ipc_fuzzer/mutate/mutate.gyp
+++ b/tools/ipc_fuzzer/message_tools/message_tools.gyp
@@ -1,4 +1,4 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
+# Copyright 2015 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.
 
@@ -8,31 +8,14 @@
   },
   'targets': [
     {
-      'target_name': 'ipc_fuzzer',
+      'target_name': 'ipc_message_util',
       'type': 'executable',
       'dependencies': [
+        '../../../third_party/re2/re2.gyp:re2',
         '../message_lib/message_lib.gyp:ipc_message_lib',
       ],
       'sources': [
-        '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 fuzzer.cc with ASan takes too long, see
-            # http://crbug.com/360158.
-            '-fsanitize=address',
-            '-fsanitize-coverage=<(sanitizer_coverage)',
-          ],
-        }],
+        'message_util.cc',
       ],
       'include_dirs': [
         '../../..',
@@ -42,21 +25,17 @@
       ],
     },
     {
-      'target_name': 'ipc_message_util',
+      'target_name': 'ipc_message_list',
       'type': 'executable',
+      'defines': [
+        'FULL_SAFE_BROWSING',
+      ],
       'dependencies': [
-        '../../../third_party/re2/re2.gyp:re2',
         '../message_lib/message_lib.gyp:ipc_message_lib',
       ],
       'sources': [
-        'message_util.cc',
-      ],
-      'include_dirs': [
-        '../../..',
-      ],
-      'defines': [
-        'USE_CUPS',
-      ],
+        'message_list.cc',
+      ]
     },
   ],
 }