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: Luigi Semenzato <semenzato@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/metrics/metrics.gyp b/metrics/metrics.gyp
index 834e52f..3d7c2d5 100644
--- a/metrics/metrics.gyp
+++ b/metrics/metrics.gyp
@@ -1,6 +1,6 @@
{
'variables': {
- 'libbase_ver': 242728,
+ 'libbase_ver': 271506,
},
'target_defaults': {
'dependencies': [
diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 264d5cd..33d0d11 100644
--- a/metrics/metrics_daemon_test.cc
+++ b/metrics/metrics_daemon_test.cc
@@ -172,8 +172,8 @@
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(),
- frequency_string_length));
+ base::WriteFile(path, frequency_string.c_str(),
+ frequency_string_length));
}
// The MetricsDaemon under test.
@@ -193,7 +193,7 @@
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));
diff --git a/metrics/metrics_library_test.cc b/metrics/metrics_library_test.cc
index f6cd7e7..377495f 100644
--- a/metrics/metrics_library_test.cc
+++ b/metrics/metrics_library_test.cc
@@ -70,9 +70,9 @@
buffer,
1,
&result));
- ASSERT_TRUE(file_util::WriteFile(base::FilePath(kTestMounts),
- kTestContents,
- strlen(kTestContents)));
+ ASSERT_TRUE(base::WriteFile(base::FilePath(kTestMounts),
+ kTestContents,
+ strlen(kTestContents)));
EXPECT_FALSE(lib_.IsDeviceMounted("guestfs",
kTestMounts,
buffer,