commit 110e030ba1a37787635e229bd36b42e33b9a9208
author Alex Deymo <deymo@google.com> Mon Oct 19 20:35:21 2015 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 22 17:42:27 2015 +0000
tree f7cf744aed39c276e8a9ec164c004388fed403e3
parent aef1c6f0b5a0059a103251a9a93bd0be43bd50a2

Remove test_utils::RecursiveUnlinkDir().

This test-only function has an equivalent implementation in libcrhome
so we remove it from update_engine and use the library version instead.

Bug: None
Test: FEATURES=test emerge-link update_engine

Change-Id: I3027c879d40461dbdf8b52dd1b65da0240549c9c

omaha_request_action_unittest.cc

diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index a560bd2..268e4c2 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -22,6 +22,7 @@
 #include <vector>
 
 #include <base/bind.h>
+#include <base/files/file_util.h>
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
@@ -1798,7 +1799,7 @@
       "version=\"0.0.0.0\" from_version=\"1.2.3.4\" "
       "track=\"stable-channel\" from_track=\"canary-channel\" "));
 
-  ASSERT_TRUE(test_utils::RecursiveUnlinkDir(test_dir));
+  ASSERT_TRUE(base::DeleteFile(base::FilePath(test_dir), true));
 }
 
 TEST_F(OmahaRequestActionTest, TestChangingToLessStableChannel) {