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

Side by Side Diff: chrome/utility/importer/firefox_importer_unittest_utils_mac.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge 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 | 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/utility/importer/firefox_importer_unittest_utils.h" 5 #include "chrome/utility/importer/firefox_importer_unittest_utils.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h"
12 #include "base/files/scoped_file.h" 12 #include "base/files/scoped_file.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/posix/global_descriptors.h" 14 #include "base/posix/global_descriptors.h"
15 #include "base/process/kill.h" 15 #include "base/process/kill.h"
16 #include "base/process/launch.h" 16 #include "base/process/launch.h"
17 #include "base/test/test_timeouts.h" 17 #include "base/test/test_timeouts.h"
18 #include "chrome/common/importer/firefox_importer_utils.h" 18 #include "chrome/common/importer/firefox_importer_utils.h"
19 #include "ipc/ipc_channel.h" 19 #include "ipc/ipc_channel.h"
20 #include "ipc/ipc_descriptors.h" 20 #include "ipc/ipc_descriptors.h"
21 #include "ipc/ipc_listener.h" 21 #include "ipc/ipc_listener.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 scoped_ptr<IPC::Channel> channel = IPC::Channel::CreateClient( 293 scoped_ptr<IPC::Channel> channel = IPC::Channel::CreateClient(
294 kTestChannelID, &listener); 294 kTestChannelID, &listener);
295 CHECK(channel->Connect()); 295 CHECK(channel->Connect());
296 listener.SetSender(channel.get()); 296 listener.SetSender(channel.get());
297 297
298 // run message loop 298 // run message loop
299 base::MessageLoop::current()->Run(); 299 base::MessageLoop::current()->Run();
300 300
301 return 0; 301 return 0;
302 } 302 }
OLDNEW
« no previous file with comments | « chrome/utility/importer/firefox_importer_unittest_utils.h ('k') | chrome/utility/importer/ie_importer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698