Restructure the ipc_fuzzer directory.

R=inferno@chromium.org,tsepez@chromium.org
BUG=450268
NOPRESUBMIT=true

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

Cr-Commit-Position: refs/heads/master@{#321422}

tools/ipc_fuzzer/mutate/fuzzer.cc → tools/ipc_fuzzer/fuzzer/fuzzer.cc

@@ -14,10 +14,10 @@
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message.h"
+#include "tools/ipc_fuzzer/fuzzer/fuzzer.h"
+#include "tools/ipc_fuzzer/fuzzer/rand_util.h"
 #include "tools/ipc_fuzzer/message_lib/message_cracker.h"
 #include "tools/ipc_fuzzer/message_lib/message_file.h"
-#include "tools/ipc_fuzzer/mutate/fuzzer.h"
-#include "tools/ipc_fuzzer/mutate/rand_util.h"
 
 #if defined(OS_POSIX)
 #include <unistd.h>

tools/ipc_fuzzer/mutate/mutate.gyp → tools/ipc_fuzzer/fuzzer/fuzzer.gyp

@@ -41,22 +41,5 @@
         'USE_CUPS',
       ],
     },
-    {
-      'target_name': 'ipc_message_util',
-      'type': 'executable',
-      'dependencies': [
-        '../../../third_party/re2/re2.gyp:re2',
-        '../message_lib/message_lib.gyp:ipc_message_lib',
-      ],
-      'sources': [
-        'message_util.cc',
-      ],
-      'include_dirs': [
-        '../../..',
-      ],
-      'defines': [
-        'USE_CUPS',
-      ],
-    },
   ],
 }

tools/ipc_fuzzer/mutate/fuzzer_main.cc → tools/ipc_fuzzer/fuzzer/fuzzer_main.cc

@@ -9,11 +9,11 @@
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "ipc/ipc_message_macros.h"
+#include "tools/ipc_fuzzer/fuzzer/fuzzer.h"
+#include "tools/ipc_fuzzer/fuzzer/generator.h"
+#include "tools/ipc_fuzzer/fuzzer/mutator.h"
+#include "tools/ipc_fuzzer/fuzzer/rand_util.h"
 #include "tools/ipc_fuzzer/message_lib/message_file.h"
-#include "tools/ipc_fuzzer/mutate/fuzzer.h"
-#include "tools/ipc_fuzzer/mutate/generator.h"
-#include "tools/ipc_fuzzer/mutate/mutator.h"
-#include "tools/ipc_fuzzer/mutate/rand_util.h"
 
 namespace ipc_fuzzer {
 

tools/ipc_fuzzer/mutate/generator.cc → tools/ipc_fuzzer/fuzzer/generator.cc

@@ -6,8 +6,8 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
-#include "tools/ipc_fuzzer/mutate/generator.h"
-#include "tools/ipc_fuzzer/mutate/rand_util.h"
+#include "tools/ipc_fuzzer/fuzzer/generator.h"
+#include "tools/ipc_fuzzer/fuzzer/rand_util.h"
 
 namespace ipc_fuzzer {
 

tools/ipc_fuzzer/mutate/generator.h → tools/ipc_fuzzer/fuzzer/generator.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "tools/ipc_fuzzer/mutate/fuzzer.h"
+#include "tools/ipc_fuzzer/fuzzer/fuzzer.h"
 
 namespace ipc_fuzzer {
 

tools/ipc_fuzzer/mutate/mutator.cc → tools/ipc_fuzzer/fuzzer/mutator.cc

@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "tools/ipc_fuzzer/mutate/mutator.h"
-#include "tools/ipc_fuzzer/mutate/rand_util.h"
+#include "tools/ipc_fuzzer/fuzzer/mutator.h"
+#include "tools/ipc_fuzzer/fuzzer/rand_util.h"
 
 namespace ipc_fuzzer {
 

tools/ipc_fuzzer/mutate/mutator.h → tools/ipc_fuzzer/fuzzer/mutator.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "tools/ipc_fuzzer/mutate/fuzzer.h"
+#include "tools/ipc_fuzzer/fuzzer/fuzzer.h"
 
 namespace ipc_fuzzer {
 

tools/ipc_fuzzer/mutate/rand_util.cc → tools/ipc_fuzzer/fuzzer/rand_util.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/rand_util.h"
-#include "tools/ipc_fuzzer/mutate/rand_util.h"
+#include "tools/ipc_fuzzer/fuzzer/rand_util.h"
 
 namespace ipc_fuzzer {
 

tools/ipc_fuzzer/ipc_fuzzer.gyp

@@ -11,11 +11,11 @@
       'target_name': 'ipc_fuzzer_all',
       'type': 'none',
       'dependencies': [
-        'dump/dump.gyp:ipc_message_dump',
-        'ipclist/ipclist.gyp:ipclist',
-        'mutate/mutate.gyp:ipc_fuzzer',
-        'mutate/mutate.gyp:ipc_message_util',
-        'replay/replay.gyp:ipc_fuzzer_replay',
+        'fuzzer/fuzzer.gyp:ipc_fuzzer',
+        'message_dump/message_dump.gyp:ipc_message_dump',
+        'message_replay/message_replay.gyp:ipc_fuzzer_replay',
+        'message_tools/message_tools.gyp:ipc_message_list',
+        'message_tools/message_tools.gyp:ipc_message_util',
       ],
     },
   ],

tools/ipc_fuzzer/replay/replay.cc → tools/ipc_fuzzer/message_replay/replay.cc

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 
 #include "base/at_exit.h"
-#include "tools/ipc_fuzzer/replay/replay_process.h"
+#include "tools/ipc_fuzzer/message_replay/replay_process.h"
 
 int main(int argc, const char** argv) {
   base::AtExitManager exit_manager;

tools/ipc_fuzzer/replay/replay_process.cc → tools/ipc_fuzzer/message_replay/replay_process.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "tools/ipc_fuzzer/replay/replay_process.h"
+#include "tools/ipc_fuzzer/message_replay/replay_process.h"
 
 #include <limits.h>
 #include <string>

tools/ipc_fuzzer/ipclist/ipclist.gyp → tools/ipc_fuzzer/message_tools/ipclist.gyp

-# Copyright 2014 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.
 {

tools/ipc_fuzzer/ipclist/ipclist.cc → tools/ipc_fuzzer/message_tools/message_list.cc

@@ -176,8 +176,8 @@ int main(int argc, char **argv) {
       skip_check = true;
     } else {
       std::cout <<
-          "usage: ipclist [--args] [--ids] [--no-check] [--filter prefix] "
-          "[--comma]\n";
+          "usage: ipc_message_list [--args] [--ids] [--no-check] "
+          "[--filter prefix] [--comma]\n";
       return 1;
     }
   }

tools/ipc_fuzzer/message_tools/message_tools.gyp

+# 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.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'ipc_message_util',
+      'type': 'executable',
+      'dependencies': [
+        '../../../third_party/re2/re2.gyp:re2',
+        '../message_lib/message_lib.gyp:ipc_message_lib',
+      ],
+      'sources': [
+        'message_util.cc',
+      ],
+      'include_dirs': [
+        '../../..',
+      ],
+      'defines': [
+        'USE_CUPS',
+      ],
+    },
+    {
+      'target_name': 'ipc_message_list',
+      'type': 'executable',
+      'defines': [
+        'FULL_SAFE_BROWSING',
+      ],
+      'dependencies': [
+        '../message_lib/message_lib.gyp:ipc_message_lib',
+      ],
+      'sources': [
+        'message_list.cc',
+      ]
+    },
+  ],
+}

tools/ipc_fuzzer/play_testcase.py → tools/ipc_fuzzer/scripts/play_testcase.py

@@ -59,7 +59,7 @@ def main():
     fuzzer_binary += '.exe'
 
   script_path = os.path.realpath(__file__)
-  ipc_fuzzer_dir = os.path.dirname(script_path)
+  ipc_fuzzer_dir = os.path.join(os.path.dirname(script_path), os.pardir)
   src_dir = os.path.abspath(os.path.join(ipc_fuzzer_dir, os.pardir, os.pardir))
   out_dir =  os.path.join(src_dir, args.out_dir)
   build_dir = os.path.join(out_dir, args.build_type)

tools/ipc_fuzzer/remove_close_messages.py → tools/ipc_fuzzer/scripts/remove_close_messages.py

@@ -37,7 +37,7 @@ def main():
   message_util_binary = 'ipc_message_util'
 
   script_path = os.path.realpath(__file__)
-  ipc_fuzzer_dir = os.path.dirname(script_path)
+  ipc_fuzzer_dir = os.path.join(os.path.dirname(script_path), os.pardir)
   src_dir = os.path.abspath(os.path.join(ipc_fuzzer_dir, os.pardir, os.pardir))
   out_dir =  os.path.join(src_dir, parsed.out_dir);
   build_dir = os.path.join(out_dir, parsed.build_type)