chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.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

« no previous file with comments | « chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"	5 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"

6	6

7 #include <string>	7 #include <string>

8	8

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/memory/scoped_ptr.h"	12 #include "base/memory/scoped_ptr.h"

13 #include "base/message_loop/message_loop.h"	13 #include "base/message_loop/message_loop.h"

14 #include "base/strings/string_util.h"	14 #include "base/strings/string_util.h"

15 #include "base/strings/stringprintf.h"	15 #include "base/strings/stringprintf.h"

16 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"	16 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"

17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"	17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

18 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"	18 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"

19 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"	19 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

20 #include "chrome/browser/chromeos/profiles/profile_helper.h"	20 #include "chrome/browser/chromeos/profiles/profile_helper.h"

21 #include "chrome/browser/chromeos/settings/cros_settings.h"	21 #include "chrome/browser/chromeos/settings/cros_settings.h"

(...skipping 706 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
728 mock_caller_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);	728 mock_caller_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);

729 EXPECT_CALL(*mock_caller_, AsyncCheckKey(user_context_.GetUserID(), _, _))	729 EXPECT_CALL(*mock_caller_, AsyncCheckKey(user_context_.GetUserID(), _, _))

730 .Times(1)	730 .Times(1)

731 .RetiresOnSaturation();	731 .RetiresOnSaturation();

732	732

733 auth_->AuthenticateToUnlock(user_context_);	733 auth_->AuthenticateToUnlock(user_context_);

734 base::MessageLoop::current()->Run();	734 base::MessageLoop::current()->Run();

735 }	735 }

736	736

737 } // namespace chromeos	737 } // namespace chromeos

OLD	NEW