chrome/browser/metrics/metrics_service.cc - Issue 10540003: Move guid generation from chrome/common/ to base/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/metrics/metrics_service.cc

Issue 10540003: Move guid generation from chrome/common/ to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: installer Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/metrics/metrics_service.cc

diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc

index 32d0211f37c7dd7c7985307ae1c9d7c0a6b150b7..ed7af636524f069535136e162da450cf3b44acfd 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();

}

//------------------------------------------------------------------------------