Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: tools/android/forwarder2/daemon.cc

Issue 560883003: Cleanup: Use base/files/file_util.h instead of base/file_util.h in [r-t]*/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « testing/android/native_test_util.cc ('k') | tools/android/forwarder2/host_forwarder_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "tools/android/forwarder2/daemon.h" 5 #include "tools/android/forwarder2/daemon.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <signal.h> 9 #include <signal.h>
10 #include <sys/file.h> 10 #include <sys/file.h>
11 #include <sys/stat.h> 11 #include <sys/stat.h>
12 #include <sys/types.h> 12 #include <sys/types.h>
13 #include <sys/wait.h> 13 #include <sys/wait.h>
14 #include <unistd.h> 14 #include <unistd.h>
15 15
16 #include <cstdlib> 16 #include <cstdlib>
17 #include <cstring> 17 #include <cstring>
18 #include <string> 18 #include <string>
19 19
20 #include "base/basictypes.h" 20 #include "base/basictypes.h"
21 #include "base/file_util.h"
22 #include "base/files/file_path.h" 21 #include "base/files/file_path.h"
22 #include "base/files/file_util.h"
23 #include "base/logging.h" 23 #include "base/logging.h"
24 #include "base/memory/scoped_ptr.h" 24 #include "base/memory/scoped_ptr.h"
25 #include "base/posix/eintr_wrapper.h" 25 #include "base/posix/eintr_wrapper.h"
26 #include "base/safe_strerror_posix.h" 26 #include "base/safe_strerror_posix.h"
27 #include "base/strings/string_number_conversions.h" 27 #include "base/strings/string_number_conversions.h"
28 #include "base/strings/stringprintf.h" 28 #include "base/strings/stringprintf.h"
29 #include "tools/android/forwarder2/common.h" 29 #include "tools/android/forwarder2/common.h"
30 #include "tools/android/forwarder2/socket.h" 30 #include "tools/android/forwarder2/socket.h"
31 31
32 namespace forwarder2 { 32 namespace forwarder2 {
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 return true; 281 return true;
282 } 282 }
283 usleep(kIdleTimeMSec * 1000); 283 usleep(kIdleTimeMSec * 1000);
284 } 284 }
285 LOG(ERROR) << "Timed out while killing daemon. " 285 LOG(ERROR) << "Timed out while killing daemon. "
286 "It might still be tearing down."; 286 "It might still be tearing down.";
287 return false; 287 return false;
288 } 288 }
289 289
290 } // namespace forwarder2 290 } // namespace forwarder2
OLDNEW
« no previous file with comments | « testing/android/native_test_util.cc ('k') | tools/android/forwarder2/host_forwarder_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698