Reverting 6815.

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

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

2 files changed, 39 insertions, 38 deletions

diff --git a/chrome/test/perf/perftests.cc b/chrome/test/perf/perftests.cc
index 18d92aa..3e67a6b 100644
--- a/chrome/test/perf/perftests.cc
+++ b/chrome/test/perf/perftests.cc
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/debug_util.h"
 #include "base/message_loop.h"
 #include "base/perftimer.h"
 #include "base/process_util.h"
@@ -14,9 +11,7 @@
 // TODO(darin): share code with base/run_all_perftests.cc
 
 int main(int argc, char **argv) {
-  base::AtExitManager exit_manager;
   base::EnableTerminationOnHeapCorruption();
-  CommandLine::SetArgcArgv(argc, argv);
   chrome::RegisterPathProvider();
   MessageLoop main_message_loop;
 
@@ -48,8 +43,8 @@ int main(int argc, char **argv) {
 
   // Raise to high priority to have more precise measurements. Since we don't
   // aim at 1% precision, it is not necessary to run at realtime level.
-  if (!DebugUtil::BeingDebugged()) {
-    base::RaiseProcessToHighPriority();
+    if (!IsDebuggerPresent()) {
+    SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
   }
 
   int result = RUN_ALL_TESTS();
diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons
index c089027..d93f4a6 100644
--- a/chrome/test/perf/perftests.scons
+++ b/chrome/test/perf/perftests.scons
@@ -1,22 +1,29 @@
-# Copyright (c) 2008 The Chromium Authors. All rights reserved.
+# Copyright (c) 2006-2008 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.
 
-__doc__ = """
-Configuration for building the perf_tests{,.exe} executable.
-"""
-
 Import('env')
 
 env = env.Clone()
 
 env.ApplySConscript([
+    '$BASE_DIR/gfx/using_base_gfx.scons',
     '$BASE_DIR/using_base.scons',
-    '$NET_DIR/using_net.scons',
+    '$BZIP2_DIR/using_bzip2.scons',
+    '$CHROME_DIR/third_party/hunspell/using_hunspell.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
+    '$CHROME_SRC_DIR/build/using_v8.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
+    '$LIBJPEG_DIR/using_libjpeg.scons',
+    '$LIBPNG_DIR/using_libpng.scons',
+    '$LIBXML_DIR/using_libxml.scons',
+    '$LIBXSLT_DIR/using_libxslt.scons',
     '$MODP_B64_DIR/using_modp_b64.scons',
+    '$NET_DIR/using_net.scons',
+    '$SDCH_DIR/using_sdch.scons',
+    '$SKIA_DIR/using_skia.scons',
+    '$ZLIB_DIR/using_zlib.scons',
 ])
 
 env.Prepend(
@@ -24,16 +31,35 @@ env.Prepend(
         'PERF_TEST',
     ],
     LIBS = [
+        'activex_shim',
         'browser',
+        'browser_views',
         'common',
+        'debugger',
+        'default_plugin',
+        'glue',
+        'JavaScriptCore_pcre',
+        'plugin',
+        'port',
+        'renderer',
         'sqlite',
+        'util',
+        'v8_snapshot',
+        'V8Bindings',
+        'views',
+        'WebCore',
+        'WTF',
     ],
 )
 
-if env['PLATFORM'] in ('posix', 'darwin'):
-  env.SConscript([
-      '$LIBEVENT_DIR/using_libevent.scons',
-  ], {'env':env})
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
+      LIBS = [
+          'rpcrt4',
+          'shlwapi',
+          'winmm',
+      ],
+  )
 
 input_files = [
     'perftests.cc',
@@ -45,24 +71,4 @@ input_files = [
     '$CHROME_DIR/common/json_value_serializer_perftest.cc',
 ]
 
-if env['PLATFORM'] == 'win32':
-  env.Prepend(
-      LIBS = [
-          'rpcrt4',
-          'shlwapi',
-          'winmm',
-      ]
-  )
-
-if env['PLATFORM'] != 'win32':
-  # TODO(port): Port these files.
-  remove_files = [
-      'url_parse_perftest.cc',
-      '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
-      '$CHROME_DIR/browser/visitedlink_perftest.cc',
-  ]
-  for file in remove_files:
-    input_files.remove(file)
-
-if env['PLATFORM'] in ('posix', 'win32'):
-  env.ChromeTestProgram('perf_tests', input_files)
+env.ChromeTestProgram('perf_tests', input_files)