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

Commit 652d6971 authored by Ben Chan's avatar Ben Chan Committed by chrome-internal-fetch
Browse files

metrics: Include base/macros.h instead of base/basictypes.h 

metrics no longer uses the integer types from base/basictypes.h. It
should simply include base/macros.h for the DISALLOW_COPY_AND_ASSIGN
macro instead.

BUG=None
TEST=`FEATURES=test emerge-$BOARD metrics platform2`

Change-Id: Id325bcb6c9d3318b5b78e42a04da9c53d0a8c3ce
Reviewed-on: https://chromium-review.googlesource.com/216349


Tested-by: default avatarAlex Vakulenko <avakulenko@chromium.org>
Tested-by: default avatarBen Chan <benchan@chromium.org>
Reviewed-by: default avatarAlex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
parent e2c2d894

metrics/metrics_library.h

+1 −1
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
#include <string>

#include <unistd.h>



#include <base/basictypes.h>

#include <base/compiler_specific.h>

#include <base/macros.h>

#include <base/memory/scoped_ptr.h>

#include <gtest/gtest_prod.h>  // for FRIEND_TEST

metrics/timer.h

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


#include <string>



#include <base/macros.h>

#include <base/memory/scoped_ptr.h>

#include <base/time/time.h>

#include <gtest/gtest_prod.h>  // for FRIEND_TEST

metrics/timer_mock.h

+0 −2
Original line number Diff line number Diff line
@@ -5,10 +5,8 @@ 
#ifndef METRICS_TIMER_MOCK_H_

#define METRICS_TIMER_MOCK_H_





#include <string>



#include <base/basictypes.h>

#include <gmock/gmock.h>



#include "metrics/timer.h"

metrics/uploader/metrics_log.h

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 


#include <string>



#include <base/macros.h>



#include "components/metrics/metrics_log_base.h"



// This file defines a set of user experience metrics data recorded by