commit 2e6543ddad0b7d64697bb2326a5cfd1ab835a489
author Ben Chan <benchan@chromium.org> Wed Feb 05 23:26:25 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Feb 12 19:39:45 2014 +0000
tree 3485c79fc80d761d11d47f66f49e2881e3fe860f
parent 09a15fa95486f7b6a3197366241827a23392918b

Update to build against libchrome-242728.

This CL updates metrics to build against libchrome-242728 and also converts
libmetrics into slotted libraries (libmetrics-180609 and libmetrics-242728).

BUG=chromium:341521
BUG=chromium:342866
CQ-DEPEND=CL:186027
CQ-DEPEND=CL:186026
CQ-DEPEND=CL:186037
CQ-DEPEND=CL:186092
CQ-DEPEND=CL:186028
CQ-DEPEND=CL:186029
CQ-DEPEND=CL:186038
CQ-DEPEND=CL:186093
CQ-DEPEND=CL:186100
CQ-DEPEND=CL:186039
TEST=Trybot run on paladin, release, and chromiumos-sdk builders.

Change-Id: I09dc3d47cfe24a22864abf217658c63493b35cba
Reviewed-on: https://chromium-review.googlesource.com/185187
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

metrics/counter_test.cc

diff --git a/metrics/counter_test.cc b/metrics/counter_test.cc
index 73a50db..c0761e2 100644
--- a/metrics/counter_test.cc
+++ b/metrics/counter_test.cc
@@ -7,7 +7,7 @@
 #include <base/file_util.h>
 #include <base/logging.h>
 #include <base/posix/eintr_wrapper.h>
-#include <base/string_util.h>
+#include <base/strings/string_util.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -15,6 +15,7 @@
 #include "counter_mock.h"  // For TaggedCounterMock.
 #include "metrics_library_mock.h"
 
+using base::FilePath;
 using ::testing::_;
 using ::testing::MockFunction;
 using ::testing::StrictMock;
@@ -58,7 +59,7 @@
   virtual void TearDown() {
     logging::SetLogMessageHandler(NULL);
     test_ = NULL;
-    file_util::Delete(FilePath(kTestRecordFile), false);
+    base::DeleteFile(FilePath(kTestRecordFile), false);
   }
 
   // Asserts that the record file contains the specified contents.
@@ -74,8 +75,8 @@
     }
 
     TaggedCounter::Record record;
-    if (!file_util::ReadFromFD(fd, reinterpret_cast<char*>(&record),
-                               sizeof(record))) {
+    if (!base::ReadFromFD(fd, reinterpret_cast<char*>(&record),
+                          sizeof(record))) {
       testing::Message msg;
       msg << "Unable to read " << sizeof(record) << " bytes from "
           << kTestRecordFile;
@@ -100,9 +101,9 @@
   bool AssertNoOrEmptyRecordFile() {
     FilePath record_file(counter_.filename_);
     int64 record_file_size;
-    return !file_util::PathExists(record_file) ||
-        (file_util::GetFileSize(record_file, &record_file_size) &&
-         record_file_size == 0);
+    return !base::PathExists(record_file) ||
+           (base::GetFileSize(record_file, &record_file_size) &&
+            record_file_size == 0);
   }
 
   // Adds a reporter call expectation that the specified tag/count
@@ -196,7 +197,7 @@
   EXPECT_TRUE(LogContains("Unable to open the persistent counter file: "
                           "No such file or directory"));
   EXPECT_EQ(TaggedCounter::kRecordInvalid, counter_.record_state_);
-  file_util::Delete(FilePath(kDoesNotExistFile), false);
+  base::DeleteFile(FilePath(kDoesNotExistFile), false);
 }
 
 TEST_F(TaggedCounterTest, Flush) {