4 files changed, 9 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 9213f6b..64af309 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -16,8 +16,8 @@
 #endif
 #include "base/md5.h"
 #include "base/message_loop.h"
+#include "base/metrics/stats_table.h"
 #include "base/path_service.h"
-#include "base/stats_table.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
@@ -178,7 +178,7 @@ TestShell::~TestShell() {
 
   PlatformCleanUp();
 
-  StatsTable *table = StatsTable::current();
+  base::StatsTable *table = base::StatsTable::current();
   if (dump_stats_table_on_exit_) {
     // Dump the stats table.
     printf("<stats>\n");
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index ca49b66..f34dd21 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -19,7 +19,6 @@
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/stats_table.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 12b3b1c..a41ce74 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -14,10 +14,10 @@
 #include "base/i18n/icu_util.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
+#include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
-#include "base/stats_table.h"
 #include "base/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/trace_event.h"
@@ -273,10 +273,10 @@ int main(int argc, char* argv[]) {
   std::string stats_filename = kStatsFilePrefix +
       base::Uint64ToString(base::RandUint64() & 0xFFFFFFFFL);
   RemoveSharedMemoryFile(stats_filename);
-  StatsTable *table = new StatsTable(stats_filename,
+  base::StatsTable *table = new base::StatsTable(stats_filename,
       kStatsFileThreads,
       kStatsFileCounters);
-  StatsTable::set_current(table);
+  base::StatsTable::set_current(table);
 
   TestShell* shell;
   if (TestShell::CreateNewWindow(starting_url, &shell)) {
@@ -398,7 +398,7 @@ int main(int argc, char* argv[]) {
   TestShell::CleanupLogging();
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
-  StatsTable::set_current(NULL);
+  base::StatsTable::set_current(NULL);
   delete table;
   RemoveSharedMemoryFile(stats_filename);
 
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc
index 812d815..afae8f2 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.cc
+++ b/webkit/tools/test_shell/test_shell_webkit_init.cc
@@ -4,8 +4,8 @@
 
 #include "webkit/tools/test_shell/test_shell_webkit_init.h"
 
+#include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
-#include "base/stats_counters.h"
 #include "media/base/media.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
@@ -20,7 +20,7 @@
 #endif
 
 TestShellWebKitInit::TestShellWebKitInit(bool layout_test_mode) {
-  v8::V8::SetCounterFunction(StatsTable::FindLocation);
+  v8::V8::SetCounterFunction(base::StatsTable::FindLocation);
 
   WebKit::initialize(this);
   WebKit::setLayoutTestMode(layout_test_mode);