summaryrefslogtreecommitdiffstats
path: root/chrome/browser/performance_monitor
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 01:26:21 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 01:26:21 +0000
commitff54ace24c73689f8d263d31140247b977617a54 (patch)
treecba4049a3ba1bc1d3e8406fda46f999773933a62 /chrome/browser/performance_monitor
parent16c2bd71bb85aaec00904934ecc6d1e4f2e0515e (diff)
downloadchromium_src-ff54ace24c73689f8d263d31140247b977617a54.zip
chromium_src-ff54ace24c73689f8d263d31140247b977617a54.tar.gz
chromium_src-ff54ace24c73689f8d263d31140247b977617a54.tar.bz2
Use a direct include of time headers in chrome/browser/, part 4.
BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/18128002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/performance_monitor')
-rw-r--r--chrome/browser/performance_monitor/constants.h4
-rw-r--r--chrome/browser/performance_monitor/database.cc2
-rw-r--r--chrome/browser/performance_monitor/database.h2
-rw-r--r--chrome/browser/performance_monitor/database_unittest.cc2
-rw-r--r--chrome/browser/performance_monitor/event.h4
-rw-r--r--chrome/browser/performance_monitor/metric.cc2
-rw-r--r--chrome/browser/performance_monitor/metric.h2
-rw-r--r--chrome/browser/performance_monitor/performance_monitor.cc2
-rw-r--r--chrome/browser/performance_monitor/performance_monitor.h2
-rw-r--r--chrome/browser/performance_monitor/performance_monitor_util.cc2
-rw-r--r--chrome/browser/performance_monitor/performance_monitor_util.h2
-rw-r--r--chrome/browser/performance_monitor/startup_timer.h2
12 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/performance_monitor/constants.h b/chrome/browser/performance_monitor/constants.h
index 5face47..168baf2 100644
--- a/chrome/browser/performance_monitor/constants.h
+++ b/chrome/browser/performance_monitor/constants.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_PERFORMANCE_MONITOR_CONSTANTS_H_
#include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace performance_monitor {
@@ -34,7 +34,7 @@ const int64 kBytesPerMegabyte = kBytesPerKilobyte * (1 << 10);
const int64 kBytesPerGigabyte = kBytesPerMegabyte * (1 << 10);
const int64 kBytesPerTerabyte = kBytesPerGigabyte * (1 << 10);
-// Time measurements - Most of these are imported from base/time.h
+// Time measurements - Most of these are imported from base/time/time.h
// These units are used for display (and it's related calculations), not for
// any mathematical analysis. Thus we can estimate for values without an exact
// conversion.
diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc
index a109f3b..36bc93c 100644
--- a/chrome/browser/performance_monitor/database.cc
+++ b/chrome/browser/performance_monitor/database.cc
@@ -13,7 +13,7 @@
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/performance_monitor/key_builder.h"
#include "chrome/common/chrome_paths.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/performance_monitor/database.h b/chrome/browser/performance_monitor/database.h
index 0ac1fb8..87082cd 100644
--- a/chrome/browser/performance_monitor/database.h
+++ b/chrome/browser/performance_monitor/database.h
@@ -13,7 +13,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/performance_monitor/constants.h"
#include "chrome/browser/performance_monitor/event.h"
#include "chrome/browser/performance_monitor/metric.h"
diff --git a/chrome/browser/performance_monitor/database_unittest.cc b/chrome/browser/performance_monitor/database_unittest.cc
index f92505a..bde1fe3 100644
--- a/chrome/browser/performance_monitor/database_unittest.cc
+++ b/chrome/browser/performance_monitor/database_unittest.cc
@@ -9,7 +9,7 @@
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/performance_monitor/database.h"
#include "chrome/browser/performance_monitor/key_builder.h"
#include "chrome/browser/performance_monitor/metric.h"
diff --git a/chrome/browser/performance_monitor/event.h b/chrome/browser/performance_monitor/event.h
index 1dbbe3b..b7666b4 100644
--- a/chrome/browser/performance_monitor/event.h
+++ b/chrome/browser/performance_monitor/event.h
@@ -5,9 +5,9 @@
#ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_
#define CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_
-#include "base/values.h"
-#include "base/time.h"
#include "base/memory/scoped_ptr.h"
+#include "base/time/time.h"
+#include "base/values.h"
namespace performance_monitor {
diff --git a/chrome/browser/performance_monitor/metric.cc b/chrome/browser/performance_monitor/metric.cc
index de50cb3..2699c41 100644
--- a/chrome/browser/performance_monitor/metric.cc
+++ b/chrome/browser/performance_monitor/metric.cc
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/performance_monitor/constants.h"
namespace performance_monitor {
diff --git a/chrome/browser/performance_monitor/metric.h b/chrome/browser/performance_monitor/metric.h
index a7772ec..ab9da9f 100644
--- a/chrome/browser/performance_monitor/metric.h
+++ b/chrome/browser/performance_monitor/metric.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_PERFORMANCE_MONITOR_METRIC_H_
#include <string>
-#include "base/time.h"
+#include "base/time/time.h"
namespace performance_monitor {
diff --git a/chrome/browser/performance_monitor/performance_monitor.cc b/chrome/browser/performance_monitor/performance_monitor.cc
index 4143f12..6d7ed4f 100644
--- a/chrome/browser/performance_monitor/performance_monitor.cc
+++ b/chrome/browser/performance_monitor/performance_monitor.cc
@@ -14,7 +14,7 @@
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/worker_pool.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/extensions/crx_installer.h"
diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h
index 652b4ea..d8cd74e 100644
--- a/chrome/browser/performance_monitor/performance_monitor.h
+++ b/chrome/browser/performance_monitor/performance_monitor.h
@@ -15,7 +15,7 @@
#include "base/memory/singleton.h"
#include "base/process.h"
#include "base/process_util.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "chrome/browser/performance_monitor/database.h"
#include "chrome/browser/performance_monitor/event.h"
#include "content/public/browser/notification_details.h"
diff --git a/chrome/browser/performance_monitor/performance_monitor_util.cc b/chrome/browser/performance_monitor/performance_monitor_util.cc
index 2682240..7f94a01 100644
--- a/chrome/browser/performance_monitor/performance_monitor_util.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_util.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/performance_monitor/events.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/performance_monitor/performance_monitor_util.h b/chrome/browser/performance_monitor/performance_monitor_util.h
index b1052db..7ad35bc 100644
--- a/chrome/browser/performance_monitor/performance_monitor_util.h
+++ b/chrome/browser/performance_monitor/performance_monitor_util.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_PERFORMANCE_MONITOR_PERFORMANCE_MONITOR_UTIL_H_
#include "base/callback.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tracked_objects.h"
#include "chrome/browser/performance_monitor/database.h"
#include "chrome/browser/performance_monitor/event.h"
diff --git a/chrome/browser/performance_monitor/startup_timer.h b/chrome/browser/performance_monitor/startup_timer.h
index 2bab4db..fc32a320 100644
--- a/chrome/browser/performance_monitor/startup_timer.h
+++ b/chrome/browser/performance_monitor/startup_timer.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_STARTUP_TIMER_H_
#define CHROME_BROWSER_PERFORMANCE_MONITOR_STARTUP_TIMER_H_
-#include "base/time.h"
+#include "base/time/time.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"