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

Side by Side Diff: sandbox/win/tests/common/controller.cc

Issue 13322003: Update the remaining references to sys_string_conversions.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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 "sandbox/win/tests/common/controller.h" 5 #include "sandbox/win/tests/common/controller.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/process.h" 9 #include "base/process.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
12 #include "base/win/windows_version.h" 12 #include "base/win/windows_version.h"
13 #include "sandbox/win/src/sandbox_factory.h" 13 #include "sandbox/win/src/sandbox_factory.h"
14 14
15 namespace { 15 namespace {
16 16
17 static const int kDefaultTimeout = 60000; 17 static const int kDefaultTimeout = 60000;
18 18
19 // Constructs a full path to a file inside the system32 folder. 19 // Constructs a full path to a file inside the system32 folder.
20 std::wstring MakePathToSys32(const wchar_t* name, bool is_obj_man_path) { 20 std::wstring MakePathToSys32(const wchar_t* name, bool is_obj_man_path) {
21 wchar_t windows_path[MAX_PATH] = {0}; 21 wchar_t windows_path[MAX_PATH] = {0};
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 328
329 target->LowerToken(); 329 target->LowerToken();
330 } else if (0 != _wcsicmp(argv[1], L"-child-no-sandbox")) { 330 } else if (0 != _wcsicmp(argv[1], L"-child-no-sandbox")) {
331 return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND; 331 return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
332 } 332 }
333 333
334 return command(argc - 4, argv + 4); 334 return command(argc - 4, argv + 4);
335 } 335 }
336 336
337 } // namespace sandbox 337 } // namespace sandbox
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698