summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics/metrics_service.cc
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 14:22:07 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 14:22:07 +0000
commit7e49ad360632304e1890082e1605b2239956afdb (patch)
tree1e3451b1a1af73cc5996c218a2888e35f1337709 /chrome/browser/metrics/metrics_service.cc
parentfacd6e7bd32c811fa8be9a065505f465396cd92e (diff)
downloadchromium_src-7e49ad360632304e1890082e1605b2239956afdb.zip
chromium_src-7e49ad360632304e1890082e1605b2239956afdb.tar.gz
chromium_src-7e49ad360632304e1890082e1605b2239956afdb.tar.bz2
Move guid generation from chrome/common/ to base/.
It will be needed in webkit/dom_storage/. BUG=NONE TEST=Existing tests. Review URL: https://chromiumcodereview.appspot.com/10540003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_service.cc')
-rw-r--r--chrome/browser/metrics/metrics_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 32d0211..ed7af63 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -145,6 +145,7 @@
#include "chrome/browser/metrics/metrics_service.h"
#include "base/bind.h"
+#include "base/guid.h"
#include "base/callback.h"
#include "base/command_line.h"
#include "base/md5.h"
@@ -178,7 +179,6 @@
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/guid.h"
#include "chrome/common/metrics/metrics_log_manager.h"
#include "chrome/common/net/test_server_locations.h"
#include "chrome/common/pref_names.h"
@@ -914,7 +914,7 @@ int MetricsService::GetLowEntropySource() {
// static
std::string MetricsService::GenerateClientID() {
- return guid::GenerateGUID();
+ return base::GenerateGUID();
}
//------------------------------------------------------------------------------