Cleanup: Use base/files/file_util.h instead of base/file_util.h in [r-t]*/

tools/android/md5sum/md5sum.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Md5sum implementation for Android. This version handles files as well as
 // directories. Its output is sorted by file path.
 
 #include <fstream>
 #include <iostream>
 #include <set>
 #include <string>
 
-#include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
 
 namespace {
 
 const int kBufferSize = 1024;
 
 // Returns whether |path|'s MD5 was successfully written to |digest_string|.
 bool MD5Sum(const char* path, std::string* digest_string) {
   std::ifstream stream(path);
@@ skipping 58 matching lines @@
   for (std::set<std::string>::const_iterator it = files.begin();
        it != files.end(); ++it) {
     if (!MD5Sum(it->c_str(), &digest))
       failed = true;
     base::FilePath file_path(*it);
     std::cout << digest << "  "
               << base::MakeAbsoluteFilePath(file_path).value() << std::endl;
   }
   return failed;
 }