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

Side by Side Diff: base/test/test_file_util_win.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « base/test/expectations/expectation.cc ('k') | base/threading/worker_pool_posix.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 "base/test/test_file_util.h" 5 #include "base/test/test_file_util.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <aclapi.h> 8 #include <aclapi.h>
9 #include <shlwapi.h> 9 #include <shlwapi.h>
10 10
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 if (!ReadFileToString(zone_path, &zone_path_contents)) 242 if (!ReadFileToString(zone_path, &zone_path_contents))
243 return false; 243 return false;
244 244
245 std::vector<std::string> lines; 245 std::vector<std::string> lines;
246 // This call also trims whitespaces, including carriage-returns (\r). 246 // This call also trims whitespaces, including carriage-returns (\r).
247 SplitString(zone_path_contents, '\n', &lines); 247 SplitString(zone_path_contents, '\n', &lines);
248 248
249 switch (lines.size()) { 249 switch (lines.size()) {
250 case 3: 250 case 3:
251 // optional empty line at end of file: 251 // optional empty line at end of file:
252 if (lines[2] != "") 252 if (!lines[2].empty())
253 return false; 253 return false;
254 // fall through: 254 // fall through:
255 case 2: 255 case 2:
256 return lines[0] == "[ZoneTransfer]" && lines[1] == "ZoneId=3"; 256 return lines[0] == "[ZoneTransfer]" && lines[1] == "ZoneId=3";
257 default: 257 default:
258 return false; 258 return false;
259 } 259 }
260 } 260 }
261 261
262 bool MakeFileUnreadable(const FilePath& path) { 262 bool MakeFileUnreadable(const FilePath& path) {
(...skipping 10 matching lines...) Expand all
273 DCHECK(info_ != NULL); 273 DCHECK(info_ != NULL);
274 DCHECK_NE(0u, length_); 274 DCHECK_NE(0u, length_);
275 } 275 }
276 276
277 FilePermissionRestorer::~FilePermissionRestorer() { 277 FilePermissionRestorer::~FilePermissionRestorer() {
278 if (!RestorePermissionInfo(path_, info_, length_)) 278 if (!RestorePermissionInfo(path_, info_, length_))
279 NOTREACHED(); 279 NOTREACHED();
280 } 280 }
281 281
282 } // namespace base 282 } // namespace base
OLDNEW
« no previous file with comments | « base/test/expectations/expectation.cc ('k') | base/threading/worker_pool_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698