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

Side by Side Diff: chrome_frame/test_utils.cc

Issue 19526005: Update include paths in chrome_frame for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 "chrome_frame/test_utils.h" 5 #include "chrome_frame/test_utils.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlwin.h> 8 #include <atlwin.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 10
11 #include <algorithm> 11 #include <algorithm>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/process_util.h" 18 #include "base/process/kill.h"
19 #include "base/process/launch.h"
19 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
20 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
21 #include "base/win/scoped_handle.h" 22 #include "base/win/scoped_handle.h"
22 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
24 #include "chrome_frame/test/chrome_frame_test_utils.h" 25 #include "chrome_frame/test/chrome_frame_test_utils.h"
25 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
26 27
27 const wchar_t kChromeFrameDllName[] = L"npchrome_frame.dll"; 28 const wchar_t kChromeFrameDllName[] = L"npchrome_frame.dll";
28 const wchar_t kChromeLauncherExeName[] = L"chrome_launcher.exe"; 29 const wchar_t kChromeLauncherExeName[] = L"chrome_launcher.exe";
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 UOI_NAME, 278 UOI_NAME,
278 name, 279 name,
279 sizeof(name), 280 sizeof(name),
280 &needed)) { 281 &needed)) {
281 is_locked = lstrcmpi(name, L"default") != 0; 282 is_locked = lstrcmpi(name, L"default") != 0;
282 } 283 }
283 ::CloseDesktop(input_desk); 284 ::CloseDesktop(input_desk);
284 } 285 }
285 return is_locked; 286 return is_locked;
286 } 287 }
OLDNEW
« no previous file with comments | « chrome_frame/test/test_with_web_server.cc ('k') | chrome_frame/turndown_prompt/turndown_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698