diff options
| author | thestig <thestig@chromium.org> | 2014-09-09 18:47:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-10 01:56:05 +0000 |
| commit | b44bd35d96e7367529c6053b68226d10fd9e9dc2 (patch) | |
| tree | f8b20231ade6da200e2b4d1ef468944bd2691502 /chromeos/process_proxy | |
| parent | 4dd3ef06036b5b7bfc430ee4a5013856cfe8d872 (diff) | |
| download | chromium_src-b44bd35d96e7367529c6053b68226d10fd9e9dc2.zip chromium_src-b44bd35d96e7367529c6053b68226d10fd9e9dc2.tar.gz chromium_src-b44bd35d96e7367529c6053b68226d10fd9e9dc2.tar.bz2 | |
Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/
TBR=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/555313002
Cr-Commit-Position: refs/heads/master@{#294072}
Diffstat (limited to 'chromeos/process_proxy')
| -rw-r--r-- | chromeos/process_proxy/process_output_watcher_unittest.cc | 8 | ||||
| -rw-r--r-- | chromeos/process_proxy/process_proxy.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chromeos/process_proxy/process_output_watcher_unittest.cc b/chromeos/process_proxy/process_output_watcher_unittest.cc index d032725..a3bdddf 100644 --- a/chromeos/process_proxy/process_output_watcher_unittest.cc +++ b/chromeos/process_proxy/process_output_watcher_unittest.cc @@ -10,7 +10,7 @@ #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" @@ -191,7 +191,7 @@ TEST_F(ProcessOutputWatcherTest, DISABLED_OutputWatcher) { test_cases.push_back(TestCase("testing error2\n", false)); RunTest(test_cases); -}; +} // http://crbug.com/396496 TEST_F(ProcessOutputWatcherTest, DISABLED_SplitUTF8Character) { @@ -299,7 +299,7 @@ TEST_F(ProcessOutputWatcherTest, DISABLED_FourByteUTF8) { 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. @@ -313,6 +313,6 @@ TEST_F(ProcessOutputWatcherTest, DISABLED_SendNull) { test_cases.push_back(TestCase("a", true)); RunTest(test_cases); -}; +} } // namespace chromeos diff --git a/chromeos/process_proxy/process_proxy.cc b/chromeos/process_proxy/process_proxy.cc index aae2ee9..881ea5a 100644 --- a/chromeos/process_proxy/process_proxy.cc +++ b/chromeos/process_proxy/process_proxy.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/process/kill.h" @@ -43,7 +43,7 @@ ProcessProxy::ProcessProxy(): process_launched_(false), // Set pipes to initial, invalid value so we can easily know if a pipe was // opened by us. ClearAllFdPairs(); -}; +} bool ProcessProxy::Open(const std::string& command, pid_t* pid) { if (process_launched_) |