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

Commit 8c3cd416 authored by Ben Chan's avatar Ben Chan Committed by chrome-internal-fetch
Browse files

metrics: Update to build against libchrome-271506 

BUG=chromium:375032
TEST=`FEATURES=test emerge-$BOARD platform2`
TEST=Trybot runs on paladin, release, and chromiumos-sdk builders.

Change-Id: Icb524d3fd4001ebc36edc84306ea70db70f7599b
Reviewed-on: https://chromium-review.googlesource.com/200519


Reviewed-by: default avatarLuigi Semenzato <semenzato@chromium.org>
Reviewed-by: default avatarDaniel Erat <derat@chromium.org>
Reviewed-by: default avatarMike Frysinger <vapier@chromium.org>
Tested-by: default avatarBen Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
parent 65dd4c61

metrics/metrics.gyp

+1 −1
Original line number Diff line number Diff line 
{

  'variables': {

    'libbase_ver': 242728,

    'libbase_ver': 271506,

  },

  'target_defaults': {

    'dependencies': [

metrics/metrics_daemon_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ class MetricsDaemonTest : public testing::Test { 
    std::string frequency_string = StringPrintf("%d\n", frequency);

    int frequency_string_length = frequency_string.length();

    EXPECT_EQ(frequency_string.length(),

        file_util::WriteFile(path, frequency_string.c_str(),

              base::WriteFile(path, frequency_string.c_str(),

                              frequency_string_length));

  }
@@ -193,7 +193,7 @@ TEST_F(MetricsDaemonTest, CheckSystemCrash) { 
  EXPECT_FALSE(daemon_.CheckSystemCrash(kKernelCrashDetected));



  base::FilePath crash_detected(kKernelCrashDetected);

  file_util::WriteFile(crash_detected, "", 0);

  base::WriteFile(crash_detected, "", 0);

  EXPECT_TRUE(base::PathExists(crash_detected));

  EXPECT_TRUE(daemon_.CheckSystemCrash(kKernelCrashDetected));

  EXPECT_FALSE(base::PathExists(crash_detected));

metrics/metrics_library_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ TEST_F(MetricsLibraryTest, IsDeviceMounted) { 
                                    buffer,

                                    1,

                                    &result));

  ASSERT_TRUE(file_util::WriteFile(base::FilePath(kTestMounts),

  ASSERT_TRUE(base::WriteFile(base::FilePath(kTestMounts),

                              kTestContents,

                              strlen(kTestContents)));

  EXPECT_FALSE(lib_.IsDeviceMounted("guestfs",