chrome/browser/net/sqlite_channel_id_store_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/net/sqlite_channel_id_store_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/net/sqlite_channel_id_store.cc ('k') | chrome/browser/password_manager/password_store_x_unittest.cc » ('j') | no next file with comments »

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 "base/bind.h"	5 #include "base/bind.h"

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

7 #include "base/files/scoped_temp_dir.h"	7 #include "base/files/scoped_temp_dir.h"

8 #include "base/memory/ref_counted.h"	8 #include "base/memory/ref_counted.h"

9 #include "base/memory/scoped_vector.h"	9 #include "base/memory/scoped_vector.h"

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

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

12 #include "base/stl_util.h"	12 #include "base/stl_util.h"

13 #include "chrome/browser/net/sqlite_channel_id_store.h"	13 #include "chrome/browser/net/sqlite_channel_id_store.h"

14 #include "chrome/common/chrome_constants.h"	14 #include "chrome/common/chrome_constants.h"

15 #include "content/public/test/mock_special_storage_policy.h"	15 #include "content/public/test/mock_special_storage_policy.h"

16 #include "content/public/test/test_browser_thread_bundle.h"	16 #include "content/public/test/test_browser_thread_bundle.h"

(...skipping 447 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
464 ASSERT_EQ("google.com", channel_ids[0]->server_identifier());	464 ASSERT_EQ("google.com", channel_ids[0]->server_identifier());

465 ASSERT_EQ(GetTestCertExpirationTime(),	465 ASSERT_EQ(GetTestCertExpirationTime(),

466 channel_ids[0]->expiration_time());	466 channel_ids[0]->expiration_time());

467 ASSERT_EQ(key_data, channel_ids[0]->private_key());	467 ASSERT_EQ(key_data, channel_ids[0]->private_key());

468 ASSERT_EQ(cert_data, channel_ids[0]->cert());	468 ASSERT_EQ(cert_data, channel_ids[0]->cert());

469	469

470 store_ = NULL;	470 store_ = NULL;

471 // Make sure we wait until the destructor has run.	471 // Make sure we wait until the destructor has run.

472 base::RunLoop().RunUntilIdle();	472 base::RunLoop().RunUntilIdle();

473 }	473 }

OLD	NEW