Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Side by Side Diff: components/metrics/test_metrics_service_client.cc

Issue 573403002: Change UMA proto product field to be an int32. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and add a couple of tests. Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « components/metrics/test_metrics_service_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/metrics/test_metrics_service_client.h" 5 #include "components/metrics/test_metrics_service_client.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "components/metrics/metrics_log_uploader.h" 8 #include "components/metrics/metrics_log_uploader.h"
9 #include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
9 10
10 namespace metrics { 11 namespace metrics {
11 12
12 // static 13 // static
13 const char TestMetricsServiceClient::kBrandForTesting[] = "brand_for_testing"; 14 const char TestMetricsServiceClient::kBrandForTesting[] = "brand_for_testing";
14 15
15 TestMetricsServiceClient::TestMetricsServiceClient() 16 TestMetricsServiceClient::TestMetricsServiceClient()
16 : version_string_("5.0.322.0-64-devel") { 17 : version_string_("5.0.322.0-64-devel"),
18 product_(ChromeUserMetricsExtension::CHROME) {
17 } 19 }
18 20
19 TestMetricsServiceClient::~TestMetricsServiceClient() { 21 TestMetricsServiceClient::~TestMetricsServiceClient() {
20 } 22 }
21 23
22 void TestMetricsServiceClient::SetMetricsClientId( 24 void TestMetricsServiceClient::SetMetricsClientId(
23 const std::string& client_id) { 25 const std::string& client_id) {
24 client_id_ = client_id; 26 client_id_ = client_id;
25 } 27 }
26 28
27 bool TestMetricsServiceClient::IsOffTheRecordSessionActive() { 29 bool TestMetricsServiceClient::IsOffTheRecordSessionActive() {
28 return false; 30 return false;
29 } 31 }
30 32
33 int32_t TestMetricsServiceClient::GetProduct() {
34 return product_;
35 }
36
31 std::string TestMetricsServiceClient::GetApplicationLocale() { 37 std::string TestMetricsServiceClient::GetApplicationLocale() {
32 return "en-US"; 38 return "en-US";
33 } 39 }
34 40
35 bool TestMetricsServiceClient::GetBrand(std::string* brand_code) { 41 bool TestMetricsServiceClient::GetBrand(std::string* brand_code) {
36 *brand_code = kBrandForTesting; 42 *brand_code = kBrandForTesting;
37 return true; 43 return true;
38 } 44 }
39 45
40 SystemProfileProto::Channel TestMetricsServiceClient::GetChannel() { 46 SystemProfileProto::Channel TestMetricsServiceClient::GetChannel() {
(...skipping 18 matching lines...) Expand all
59 } 65 }
60 66
61 scoped_ptr<MetricsLogUploader> TestMetricsServiceClient::CreateUploader( 67 scoped_ptr<MetricsLogUploader> TestMetricsServiceClient::CreateUploader(
62 const std::string& server_url, 68 const std::string& server_url,
63 const std::string& mime_type, 69 const std::string& mime_type,
64 const base::Callback<void(int)>& on_upload_complete) { 70 const base::Callback<void(int)>& on_upload_complete) {
65 return scoped_ptr<MetricsLogUploader>(); 71 return scoped_ptr<MetricsLogUploader>();
66 } 72 }
67 73
68 } // namespace metrics 74 } // namespace metrics
OLDNEW
« no previous file with comments | « components/metrics/test_metrics_service_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698