Rename WebKitTools->Tools.

BUG=None
TEST=None
TBR=yurys

Review URL: http://codereview.chromium.org/6015002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69627 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 21 insertions, 25 deletions

diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm
index b167aa22..4d51a18 100644
--- a/base/process_util_mac.mm
+++ b/base/process_util_mac.mm
@@ -596,7 +596,7 @@ void EnableTerminationOnOutOfMemory() {
         !g_old_valloc_purgeable && !g_old_realloc_purgeable &&
         !g_old_memalign_purgeable) << "Old allocators unexpectedly non-null";
 
-  // See http://trac.webkit.org/changeset/53362/trunk/WebKitTools/DumpRenderTree/mac
+  // See http://trac.webkit.org/changeset/53362/trunk/Tools/DumpRenderTree/mac
   bool zone_allocators_protected = darwin_version > 10;
 
   ChromeMallocZone* default_zone =
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 9fbb857..f8c723b 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -886,7 +886,7 @@ static CommandLine* CreateHttpServerCommandLine() {
   FilePath script_path(src_path);
   script_path = script_path.AppendASCII("third_party");
   script_path = script_path.AppendASCII("WebKit");
-  script_path = script_path.AppendASCII("WebKitTools");
+  script_path = script_path.AppendASCII("Tools");
   script_path = script_path.AppendASCII("Scripts");
   script_path = script_path.AppendASCII("new-run-webkit-httpd");
 
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index bf4d9dc..d900021 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -731,7 +731,7 @@ void TestWebSocketServer::SetPythonPath() {
   scripts_path = scripts_path
       .Append(FILE_PATH_LITERAL("third_party"))
       .Append(FILE_PATH_LITERAL("WebKit"))
-      .Append(FILE_PATH_LITERAL("WebKitTools"))
+      .Append(FILE_PATH_LITERAL("Tools"))
       .Append(FILE_PATH_LITERAL("Scripts"));
   AppendToPythonPath(scripts_path);
 }
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index f6e383f..5299451 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -273,7 +273,7 @@ class TimedMessageLoopRunner {
 // object, and is stopped when the destructor is called. Note that
 // because of the underlying script that is used:
 //
-//    third_paty/WebKit/WebKitTools/Scripts/new-run-webkit-websocketserver
+//    third_paty/WebKit/Tools/Scripts/new-run-webkit-websocketserver
 //
 // Only *_wsh.py handlers found under "http/tests/websocket/tests" from the
 // |root_directory| will be found and active while running the test
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
index f7be435..2973987 100644
--- a/tools/imagediff/image_diff.cc
+++ b/tools/imagediff/image_diff.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // This file input format is based loosely on
-// WebKitTools/DumpRenderTree/ImageDiff.m
+// Tools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
 // what the run-webkit-tests script expects.
diff --git a/webkit/tools/layout_tests/rebaseline.bat b/webkit/tools/layout_tests/rebaseline.bat
index ba9d079..1d63ac5 100644
--- a/webkit/tools/layout_tests/rebaseline.bat
+++ b/webkit/tools/layout_tests/rebaseline.bat
@@ -1 +1 @@
-%~dp0..\..\..\third_party\python_24\python.exe %~dp0\..\..\..\third_party\WebKit\WebKitTools\Scripts\rebaseline-chromium-webkit-tests %*

+%~dp0..\..\..\third_party\python_24\python.exe %~dp0\..\..\..\third_party\WebKit\Tools\Scripts\rebaseline-chromium-webkit-tests %*

diff --git a/webkit/tools/layout_tests/rebaseline.sh b/webkit/tools/layout_tests/rebaseline.sh
index a203017..3ae4ff2 100755
--- a/webkit/tools/layout_tests/rebaseline.sh
+++ b/webkit/tools/layout_tests/rebaseline.sh
@@ -15,7 +15,7 @@ if grep -q REBASELINE $exec_dir/test_expectations.txt ; then
   echo "Try:"
   echo "cd ../../../third_party/WebKit"
   echo "\$EDITOR LayoutTests/platform/chromium/test_expectations.txt"
-  echo "./WebKitTools/Scripts/rebaseline-chromium-webkit-tests"
+  echo "./Tools/Scripts/rebaseline-chromium-webkit-tests"
   echo
   echo "See also https://trac.webkit.org/wiki/Rebaseline"
   exit 1
@@ -23,4 +23,4 @@ fi
 
 PYTHON_PROG=python
 
-"$PYTHON_PROG" "$exec_dir/../../../third_party/WebKit/WebKitTools/Scripts/rebaseline-chromium-webkit-tests" "$@"
+"$PYTHON_PROG" "$exec_dir/../../../third_party/WebKit/Tools/Scripts/rebaseline-chromium-webkit-tests" "$@"
diff --git a/webkit/tools/layout_tests/run_http_server.py b/webkit/tools/layout_tests/run_http_server.py
index 45c8040..d7eadc6 100644
--- a/webkit/tools/layout_tests/run_http_server.py
+++ b/webkit/tools/layout_tests/run_http_server.py
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 """Wrapper around
-   third_party/WebKit/WebKitTools/Scripts/new-run-webkit-httpd"""
+   third_party/WebKit/Tools/Scripts/new-run-webkit-httpd"""
 import os
 import subprocess
 import sys
@@ -13,7 +13,7 @@ def main():
     cmd = [sys.executable]
     src_dir=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(
                          os.path.dirname(os.path.abspath(sys.argv[0]))))))
-    script_dir=os.path.join(src_dir, "third_party", "WebKit", "WebKitTools",
+    script_dir=os.path.join(src_dir, "third_party", "WebKit", "Tools",
                             "Scripts")
     script = os.path.join(script_dir, 'new-run-webkit-httpd')
     cmd.append(script)
@@ -22,4 +22,3 @@ def main():
 
 if __name__ == '__main__':
     sys.exit(main())
-
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index b986870..7439a6a 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 """Wrapper around
-   third_party/WebKit/WebKitTools/Scripts/new-run-webkit-tests"""
+   third_party/WebKit/Tools/Scripts/new-run-webkit-tests"""
 import os
 import subprocess
 import sys
@@ -12,7 +12,7 @@ import sys
 def main():
     cmd = [sys.executable]
     src_dir = os.path.abspath(os.path.join(sys.path[0], '..', '..', '..'))
-    script_dir=os.path.join(src_dir, "third_party", "WebKit", "WebKitTools",
+    script_dir=os.path.join(src_dir, "third_party", "WebKit", "Tools",
                             "Scripts")
     script = os.path.join(script_dir, 'new-run-webkit-tests')
     cmd.append(script)
@@ -23,4 +23,3 @@ def main():
 
 if __name__ == '__main__':
     sys.exit(main())
-
diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/expectations_line.py b/webkit/tools/layout_tests/webkitpy/layout_tests/expectations_line.py
index 0bce734..1597a61 100644
--- a/webkit/tools/layout_tests/webkitpy/layout_tests/expectations_line.py
+++ b/webkit/tools/layout_tests/webkitpy/layout_tests/expectations_line.py
@@ -18,7 +18,7 @@ except NameError:
 
 this_file = os.path.abspath(f)
 base_dir = this_file[0:this_file.find('webkit'+ os.sep + 'tools')]
-webkitpy_dir = os.path.join(base_dir, 'third_party', 'WebKit', 'WebKitTools',
+webkitpy_dir = os.path.join(base_dir, 'third_party', 'WebKit', 'Tools',
                             'Scripts')
 sys.path.append(webkitpy_dir)
 
@@ -143,4 +143,3 @@ class ExpectationsLine(test_expectations.TestExpectationsFile):
             self._test,
             " ".join(self._expectations).upper())
         return result
-
diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/update_expectations_from_dashboard.py b/webkit/tools/layout_tests/webkitpy/layout_tests/update_expectations_from_dashboard.py
index 45bb1f3..f4a564a 100644
--- a/webkit/tools/layout_tests/webkitpy/layout_tests/update_expectations_from_dashboard.py
+++ b/webkit/tools/layout_tests/webkitpy/layout_tests/update_expectations_from_dashboard.py
@@ -30,7 +30,7 @@ except NameError:
 
 this_file = os.path.abspath(f)
 base_dir = this_file[0:this_file.find('webkit'+ os.sep + 'tools')]
-webkitpy_dir = os.path.join(base_dir, 'third_party', 'WebKit', 'WebKitTools',
+webkitpy_dir = os.path.join(base_dir, 'third_party', 'WebKit', 'Tools',
                             'Scripts')
 sys.path.append(webkitpy_dir)
 
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 9f6fe4b..d86d374 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -582,7 +582,7 @@ void EventSendingController::keyDown(
     }
 
     // For one generated keyboard event, we need to generate a keyDown/keyUp
-    // pair; refer to EventSender.cpp in WebKit/WebKitTools/DumpRenderTree/win.
+    // pair; refer to EventSender.cpp in WebKit/Tools/DumpRenderTree/win.
     // On Windows, we might also need to generate a char event to mimic the
     // Windows event flow; on other platforms we create a merged event and test
     // the event flow that that platform provides.
@@ -669,7 +669,7 @@ void EventSendingController::dispatchMessage(
 bool EventSendingController::NeedsShiftModifier(int key_code) {
   // If code is an uppercase letter, assign a SHIFT key to
   // event_down.modifier, this logic comes from
-  // WebKit/WebKitTools/DumpRenderTree/Win/EventSender.cpp
+  // WebKit/Tools/DumpRenderTree/Win/EventSender.cpp
   if ((key_code & 0xFF) >= 'A' && (key_code & 0xFF) <= 'Z')
     return true;
   return false;
diff --git a/webkit/tools/test_shell/event_sending_controller.h b/webkit/tools/test_shell/event_sending_controller.h
index 0950868..ea19d9a 100644
--- a/webkit/tools/test_shell/event_sending_controller.h
+++ b/webkit/tools/test_shell/event_sending_controller.h
@@ -10,7 +10,7 @@
   the test_shell to fire DOM events.
 
   The OSX reference file is in
-  WebKit/WebKitTools/DumpRenderTree/EventSendingController.m
+  WebKit/Tools/DumpRenderTree/EventSendingController.m
 */
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_EVENT_SENDING_CONTROLLER_H_
diff --git a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h
index 44ea1be..41796ea3 100644
--- a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h
+++ b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h
@@ -30,7 +30,7 @@
 
 //
 // This file comes from WebKit:
-//    WebKit/WebKitTools/DumpRenderTree/mac/DumpRenderTreePasteboard.m
+//    WebKit/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.m
 // It is copied here since that location is the best for pulling into Chromium
 // and has a few includes commented out.  darin@chromium.org suggests in the
 // future we see if there is a better place for it to live so it could be
diff --git a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m
index 41b3eed..3e3cf1c 100644
--- a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m
+++ b/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m
@@ -30,7 +30,7 @@
 
 //
 // This file comes from WebKit:
-//    WebKit/WebKitTools/DumpRenderTree/mac/DumpRenderTreePasteboard.m
+//    WebKit/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.m
 // It is copied here since that location is the best for pulling into Chromium
 // and has a few includes commented out.  darin@chromium.org suggests in the
 // future we see if there is a better place for it to live so it could be
diff --git a/webkit/tools/test_shell/plain_text_controller.h b/webkit/tools/test_shell/plain_text_controller.h
index 737b275..20e3126 100644
--- a/webkit/tools/test_shell/plain_text_controller.h
+++ b/webkit/tools/test_shell/plain_text_controller.h
@@ -8,7 +8,7 @@
 // the test_shell to extract plain text from the DOM or the selection.
 //
 // The OSX reference file is in
-// WebKit/WebKitTools/DumpRenderTree/PlainTextController.mm
+// WebKit/Tools/DumpRenderTree/PlainTextController.mm
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_PLAIN_TEXT_CONTROLLER_H_
 #define WEBKIT_TOOLS_TEST_SHELL_PLAIN_TEXT_CONTROLLER_H_
@@ -36,4 +36,3 @@ class PlainTextController : public CppBoundClass {
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_PLAIN_TEXT_CONTROLLER_H_
-
diff --git a/webkit/tools/test_shell/text_input_controller.h b/webkit/tools/test_shell/text_input_controller.h
index 4e94708..2657f83 100644
--- a/webkit/tools/test_shell/text_input_controller.h
+++ b/webkit/tools/test_shell/text_input_controller.h
@@ -6,7 +6,7 @@
 // when test_shell is running in layout test mode.  Layout tests use it to
 // exercise various corners of text input.
 //
-// Mac equivalent: WebKit/WebKitTools/DumpRenderTree/TextInputController.{h,m}
+// Mac equivalent: WebKit/Tools/DumpRenderTree/TextInputController.{h,m}
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEXT_INPUT_CONTROLLER_H__
 #define WEBKIT_TOOLS_TEST_SHELL_TEXT_INPUT_CONTROLLER_H__