17 files changed, 16 insertions, 16 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 98b89ef..e7302d4 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3007,18 +3007,18 @@
       ],
       'sources': [
         # TODO(darin): Move other UIPerfTests here.
-        'test/memory_test/memory_test.cc',
-        'test/page_cycler/page_cycler_test.cc',
+        'test/perf/dom_checker_uitest.cc',
+        'test/perf/dromaeo_benchmark_uitest.cc',
+        'test/perf/feature_startup_test.cc',
         'test/perf/frame_rate/frame_rate_tests.cc',
-        'test/startup/feature_startup_test.cc',
-        'test/startup/shutdown_test.cc',
-        'test/startup/startup_test.cc',
-        'test/tab_switching/tab_switching_test.cc',
-        'test/ui/dom_checker_uitest.cc',
-        'test/ui/dromaeo_benchmark_uitest.cc',
-        'test/ui/sunspider_uitest.cc',
-        'test/ui/v8_benchmark_uitest.cc',
-        'test/url_fetch_test/url_fetch_test.cc',
+        'test/perf/memory_test.cc',
+        'test/perf/page_cycler_test.cc',
+        'test/perf/shutdown_test.cc',
+        'test/perf/startup_test.cc',
+        'test/perf/sunspider_uitest.cc',
+        'test/perf/tab_switching_test.cc',
+        'test/perf/url_fetch_test.cc',
+        'test/perf/v8_benchmark_uitest.cc',
       ],
       'conditions': [
         ['OS=="win" and buildtype=="Official"', {
diff --git a/chrome/test/data/sunspider/sunspider-results.html b/chrome/test/data/sunspider/sunspider-results.html
index c7035cf..73e3d98 100644
--- a/chrome/test/data/sunspider/sunspider-results.html
+++ b/chrome/test/data/sunspider/sunspider-results.html
@@ -78,7 +78,7 @@ function print(str) {
     console.appendChild(document.createElement("br"));
 }
 </script>
-<script src="../../ui/sunspider_uitest.js"></script>
+<script src="../../perf/sunspider_uitest.js"></script>
 <script src="sunspider-test-prefix.js"></script>
 <script src="sunspider-analyze-results.js"></script>
 <script src="sunspider-compare-results.js"></script>
diff --git a/chrome/test/data/v8_benchmark/run.html b/chrome/test/data/v8_benchmark/run.html
index d0471cf..0f46e85 100644
--- a/chrome/test/data/v8_benchmark/run.html
+++ b/chrome/test/data/v8_benchmark/run.html
@@ -2,7 +2,7 @@
 <head>
 <title>V8 Benchmark Suite</title>
 <script type="text/javascript" src="../json2.js"></script>
-<script type="text/javascript" src="../../ui/v8_benchmark_uitest.js"></script>
+<script type="text/javascript" src="../../perf/v8_benchmark_uitest.js"></script>
 <script type="text/javascript" src="base.js"></script>
 <script type="text/javascript" src="richards.js"></script>
 <script type="text/javascript" src="deltablue.js"></script>
diff --git a/chrome/test/functional/media/ui_perf_test_utils.py b/chrome/test/functional/media/ui_perf_test_utils.py
index fdef23a..cb7e28d 100644
--- a/chrome/test/functional/media/ui_perf_test_utils.py
+++ b/chrome/test/functional/media/ui_perf_test_utils.py
@@ -7,7 +7,7 @@
 
 Ref: http://code.google.com/p/psutil/wiki/Documentation
 
-Most part of this module is from chrome/test/startup/startup_test.cc and
+Most part of this module is from chrome/test/perf/startup_test.cc and
 chrome/test/ui/ui_perf_test.[h,cc] So, we try to preserve the original C++ code
 here in case when there is change in original C++ code, it is easy to update
 this.
diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc
index 6ca9c1a..6ca9c1a 100644
--- a/chrome/test/ui/dom_checker_uitest.cc
+++ b/chrome/test/perf/dom_checker_uitest.cc
diff --git a/chrome/test/ui/dromaeo_benchmark_uitest.cc b/chrome/test/perf/dromaeo_benchmark_uitest.cc
index 58755b2..58755b2 100644
--- a/chrome/test/ui/dromaeo_benchmark_uitest.cc
+++ b/chrome/test/perf/dromaeo_benchmark_uitest.cc
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/perf/feature_startup_test.cc
index b554b0ac..b554b0ac 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/perf/feature_startup_test.cc
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/perf/memory_test.cc
index 4f18d50..4f18d50 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/perf/memory_test.cc
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc
index 592fc15..592fc15 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/perf/page_cycler_test.cc
diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/perf/shutdown_test.cc
index fcf79ef..fcf79ef 100644
--- a/chrome/test/startup/shutdown_test.cc
+++ b/chrome/test/perf/shutdown_test.cc
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/perf/startup_test.cc
index 80ac34c..80ac34c 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/perf/startup_test.cc
diff --git a/chrome/test/ui/sunspider_uitest.cc b/chrome/test/perf/sunspider_uitest.cc
index 0e976d0..0e976d0 100644
--- a/chrome/test/ui/sunspider_uitest.cc
+++ b/chrome/test/perf/sunspider_uitest.cc
diff --git a/chrome/test/ui/sunspider_uitest.js b/chrome/test/perf/sunspider_uitest.js
index 8e488d2..10f88f0 100644
--- a/chrome/test/ui/sunspider_uitest.js
+++ b/chrome/test/perf/sunspider_uitest.js
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2009 The Chromium Authors. All rights reserved.
+  Copyright (c) 2011 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.
 */
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc
index b1ca31d..b1ca31d 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/perf/tab_switching_test.cc
diff --git a/chrome/test/url_fetch_test/url_fetch_test.cc b/chrome/test/perf/url_fetch_test.cc
index 67becf8..67becf8 100644
--- a/chrome/test/url_fetch_test/url_fetch_test.cc
+++ b/chrome/test/perf/url_fetch_test.cc
diff --git a/chrome/test/ui/v8_benchmark_uitest.cc b/chrome/test/perf/v8_benchmark_uitest.cc
index 3fb5737..3fb5737 100644
--- a/chrome/test/ui/v8_benchmark_uitest.cc
+++ b/chrome/test/perf/v8_benchmark_uitest.cc
diff --git a/chrome/test/ui/v8_benchmark_uitest.js b/chrome/test/perf/v8_benchmark_uitest.js
index 9950c5a..c20295d 100644
--- a/chrome/test/ui/v8_benchmark_uitest.js
+++ b/chrome/test/perf/v8_benchmark_uitest.js
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2009 The Chromium Authors. All rights reserved.
+  Copyright (c) 2011 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.
 */