chromeos/network/network_cert_migrator_unittest.cc - Issue 555313002: Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/

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: chromeos/network/network_cert_migrator_unittest.cc

Issue 555313002: Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chromeos/network/client_cert_resolver_unittest.cc ('k') | chromeos/network/network_connection_handler_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "chromeos/network/network_cert_migrator.h"	5 #include "chromeos/network/network_cert_migrator.h"

6	6

7 #include <cert.h>	7 #include <cert.h>

8	8

9 #include "base/file_util.h"

10 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

	10 #include "base/files/file_util.h"

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

12 #include "base/strings/string_number_conversions.h"	12 #include "base/strings/string_number_conversions.h"

13 #include "chromeos/cert_loader.h"	13 #include "chromeos/cert_loader.h"

14 #include "chromeos/dbus/dbus_thread_manager.h"	14 #include "chromeos/dbus/dbus_thread_manager.h"

15 #include "chromeos/dbus/shill_profile_client.h"	15 #include "chromeos/dbus/shill_profile_client.h"

16 #include "chromeos/dbus/shill_service_client.h"	16 #include "chromeos/dbus/shill_service_client.h"

17 #include "chromeos/network/network_state_handler.h"	17 #include "chromeos/network/network_state_handler.h"

18 #include "chromeos/tpm_token_loader.h"	18 #include "chromeos/tpm_token_loader.h"

19 #include "crypto/nss_util_internal.h"	19 #include "crypto/nss_util_internal.h"

20 #include "crypto/scoped_test_nss_chromeos_user.h"	20 #include "crypto/scoped_test_nss_chromeos_user.h"

(...skipping 475 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
496 base::RunLoop().RunUntilIdle();	496 base::RunLoop().RunUntilIdle();

497	497

498 std::string pkcs11_id;	498 std::string pkcs11_id;

499 std::string slot_id;	499 std::string slot_id;

500 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id);	500 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id);

501 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id);	501 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id);

502 EXPECT_EQ(test_client_cert_slot_id_, slot_id);	502 EXPECT_EQ(test_client_cert_slot_id_, slot_id);

503 }	503 }

504	504

505 } // namespace chromeos	505 } // namespace chromeos

OLD	NEW