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

Commit 817016a8 authored by Chris Masone's avatar Chris Masone
Browse files

[metrics] Roll forward to new libchrome 

BUG=chromium-os:14304
TEST=build, unit tests

Change-Id: I92fd96b2c14df847efe47735c0f76d99023ec254
Reviewed-on: http://gerrit.chromium.org/gerrit/819


Reviewed-by: default avatarDarin Petkov <petkov@chromium.org>
Tested-by: default avatarChris Masone <cmasone@chromium.org>
parent 8032dd0c

metrics/counter.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <time.h>



#include <base/basictypes.h>

#include <base/scoped_ptr.h>

#include <base/memory/scoped_ptr.h>

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



class MetricsLibraryInterface;

metrics/counter_test.cc

+5 −1
Original line number Diff line number Diff line
@@ -123,7 +123,11 @@ class TaggedCounterTest : public testing::Test { 


  // Collects log messages in the |log_| member string so that they

  // can be analyzed for errors and expected behavior.

  static bool HandleLogMessages(int severity, const std::string& str) {

  static bool HandleLogMessages(int severity,

                                const char* file,

                                int line,

                                size_t message_start,

                                const std::string& str) {

    test_->log_.append(str);

    test_->log_.append("\n");

metrics/metrics_daemon.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <map>



#include <base/file_path.h>

#include <base/scoped_ptr.h>

#include <base/memory/scoped_ptr.h>

#include <base/time.h>

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