chrome/browser/metrics/metrics_log_unittest.cc - Issue 239093004: Move part of metrics from chrome/common to components

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_log_unittest.cc

Issue 239093004: Move part of metrics from chrome/common to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Alphabetizing DEPS Created 6 years, 8 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/metrics/metrics_log_serializer_unittest.cc ('k') | chrome/browser/metrics/metrics_network_observer.h » ('j') | components/metrics.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/metrics/metrics_log_unittest.cc

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

index 2f112a9fb33d21744e12b649dbe28dcf4d0abc01..91c1cf333c526f5645691899116483d59e8f184c 100644

--- a/chrome/browser/metrics/metrics_log_unittest.cc

+++ b/chrome/browser/metrics/metrics_log_unittest.cc

@@ -23,12 +23,13 @@

#include "chrome/browser/google/google_util.h"

#include "chrome/browser/prefs/browser_prefs.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/metrics/proto/profiler_event.pb.h"

-#include "chrome/common/metrics/proto/system_profile.pb.h"

+#include "chrome/common/chrome_version_info.h"

#include "chrome/common/metrics/variations/variations_util.h"

#include "chrome/common/pref_names.h"

#include "chrome/installer/util/google_update_settings.h"

#include "components/metrics/metrics_hashes.h"

+#include "components/metrics/proto/profiler_event.pb.h"

+#include "components/metrics/proto/system_profile.pb.h"

#include "components/variations/metrics_util.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/common/process_type.h"

@@ -650,6 +651,11 @@ TEST_F(MetricsLogTest, RecordProfilerData) {

}

+TEST_F(MetricsLogTest, ChromeVersionWritten) {

Alexei Svitkine (slow) 2014/04/22 15:28:10 The name of this test should say "channel" somewhe

bsimonnet 2014/04/22 16:52:43 Done.

+ TestMetricsLog log("user@test.com", kSessionId, MetricsLog::ONGOING_LOG);

+ EXPECT_TRUE(log.uma_proto().system_profile().has_channel());

#if defined(OS_CHROMEOS)

TEST_F(MetricsLogTest, MultiProfileUserCount) {

std::string user1("user1@example.com");

« no previous file with comments | « chrome/browser/metrics/metrics_log_serializer_unittest.cc ('k') | chrome/browser/metrics/metrics_network_observer.h » ('j') | components/metrics.gypi » ('J')