Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/

chromeos/process_proxy/process_output_watcher_unittest.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.
 
 #include <gtest/gtest.h>
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread.h"
 #include "chromeos/process_proxy/process_output_watcher.h"
 
 namespace chromeos {
 
 struct TestCase {
@@ skipping 160 matching lines @@
   test_cases.push_back(TestCase("testing output\n", false));
   test_cases.push_back(TestCase("testing error\n", false));
   test_cases.push_back(TestCase("testing error1\n", false));
   test_cases.push_back(TestCase("testing output1\n", false));
   test_cases.push_back(TestCase("testing output2\n", false));
   test_cases.push_back(TestCase("testing output3\n", false));
   test_cases.push_back(TestCase(VeryLongString(), false));
   test_cases.push_back(TestCase("testing error2\n", false));
 
   RunTest(test_cases);
-};
+}
 
 // http://crbug.com/396496
 TEST_F(ProcessOutputWatcherTest, DISABLED_SplitUTF8Character) {
   std::vector<TestCase> test_cases;
   test_cases.push_back(TestCase("test1\xc2", false, "test1"));
   test_cases.push_back(TestCase("\xb5test1", false, "\xc2\xb5test1"));
 
   RunTest(test_cases);
 }
 
@@ skipping 87 matching lines @@
   RunTest(test_cases);
 }
 
 // http://crbug.com/396496
 TEST_F(ProcessOutputWatcherTest, DISABLED_FourByteUTF8) {
   std::vector<TestCase> test_cases;
   test_cases.push_back(TestCase("\xf0\xa4\xad", false, ""));
   test_cases.push_back(TestCase("\xa2", false, "\xf0\xa4\xad\xa2"));
 
   RunTest(test_cases);
-};
+}
 
 // Verifies that sending '\0' generates PROCESS_OUTPUT_TYPE_OUT event and does
 // not terminate output watcher.
 // http://crbug.com/396496
 TEST_F(ProcessOutputWatcherTest, DISABLED_SendNull) {
   std::vector<TestCase> test_cases;
   // This will send '\0' to output watcher.
   test_cases.push_back(TestCase("", true));
   // Let's verify that next input also gets detected (i.e. output watcher does
   // not exit after seeing '\0' from previous test case).
   test_cases.push_back(TestCase("a", true));
 
   RunTest(test_cases);
-};
+}
 
 }  // namespace chromeos