Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c95440e9 authored by Bertrand SIMONNET's avatar Bertrand SIMONNET Committed by ChromeOS Commit Bot
Browse files

metrics: Import protobufs from Chromium. 

Instead of pulling the protobufs from chromium, copy them into
platform2/metrics/proto.
This enables us to add Chromium OS specific changes without polluting
Chromium's protobuf.

BUG=chrome-os-partner:42861
TEST=`FEATURES=test emerge-gizmo metrics` succeeds.

CQ-DEPEND=CL:286895

Change-Id: Ib919a21da6518199c29adb70c8bc27220e0dc031
Reviewed-on: https://chromium-review.googlesource.com/286943


Reviewed-by: default avatarGaurav Shah <gauravsh@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>
Trybot-Ready: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: default avatarBertrand Simonnet <bsimonnet@chromium.org>
parent dc865898

metrics/metrics.gyp

+2 −7
Original line number Diff line number Diff line
@@ -83,17 +83,12 @@ 
      'target_name': 'metrics_proto',

      'type': 'static_library',

      'variables': {

        'proto_in_dir': 'components/metrics/proto/',

        'proto_out_dir': 'include/components/metrics/proto',

        'proto_in_dir': 'uploader/proto',

        'proto_out_dir': 'include/metrics/uploader/proto',

      },

      'sources': [

        '<(proto_in_dir)/chrome_user_metrics_extension.proto',

        '<(proto_in_dir)/histogram_event.proto',

        '<(proto_in_dir)/omnibox_event.proto',

        '<(proto_in_dir)/omnibox_input_type.proto',

        '<(proto_in_dir)/perf_data.proto',

        '<(proto_in_dir)/profiler_event.proto',

        '<(proto_in_dir)/sampled_profile.proto',

        '<(proto_in_dir)/system_profile.proto',

        '<(proto_in_dir)/user_action_event.proto',

      ],

metrics/uploader/metrics_log.cc

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include <string>



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

#include "metrics/uploader/proto/system_profile.pb.h"

#include "uploader/system_profile_setter.h"



// We use default values for the MetricsLogBase constructor as the setter will

metrics/uploader/metrics_log_base.cc

+3 −3
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 


#include "base/metrics/histogram_base.h"

#include "base/metrics/histogram_samples.h"

#include "components/metrics/proto/histogram_event.pb.h"

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

#include "components/metrics/proto/user_action_event.pb.h"

#include "metrics/uploader/metrics_hashes.h"

#include "metrics/uploader/proto/histogram_event.pb.h"

#include "metrics/uploader/proto/system_profile.pb.h"

#include "metrics/uploader/proto/user_action_event.pb.h"



using base::Histogram;

using base::HistogramBase;

metrics/uploader/metrics_log_base.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "base/macros.h"

#include "base/metrics/histogram.h"

#include "base/time/time.h"

#include "components/metrics/proto/chrome_user_metrics_extension.pb.h"

#include "metrics/uploader/proto/chrome_user_metrics_extension.pb.h"



namespace base {

class HistogramSamples;

metrics/uploader/metrics_log_base_unittest.cc

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <base/metrics/sample_vector.h>

#include <gtest/gtest.h>



#include "components/metrics/proto/chrome_user_metrics_extension.pb.h"

#include "metrics/uploader/proto/chrome_user_metrics_extension.pb.h"



namespace metrics {