content/browser/dom_storage/dom_storage_context_impl_unittest.cc - Issue 538403002: Change base/file_utils.h includes to base/files/file_utils.h in content/

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: content/browser/dom_storage/dom_storage_context_impl_unittest.cc

Issue 538403002: Change base/file_utils.h includes to base/files/file_utils.h in content/ (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 | « content/browser/dom_storage/dom_storage_context_impl.cc ('k') | content/browser/dom_storage/dom_storage_database.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 "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/message_loop/message_loop.h"	8 #include "base/message_loop/message_loop.h"

9 #include "base/message_loop/message_loop_proxy.h"	9 #include "base/message_loop/message_loop_proxy.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "base/threading/sequenced_worker_pool.h"	11 #include "base/threading/sequenced_worker_pool.h"

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

13 #include "content/browser/dom_storage/dom_storage_area.h"	13 #include "content/browser/dom_storage/dom_storage_area.h"

14 #include "content/browser/dom_storage/dom_storage_context_impl.h"	14 #include "content/browser/dom_storage/dom_storage_context_impl.h"

15 #include "content/browser/dom_storage/dom_storage_namespace.h"	15 #include "content/browser/dom_storage/dom_storage_namespace.h"

16 #include "content/browser/dom_storage/dom_storage_task_runner.h"	16 #include "content/browser/dom_storage/dom_storage_task_runner.h"

(...skipping 350 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
367 // Verify that the merge was successful.	367 // Verify that the merge was successful.

368 ASSERT_TRUE(alias_ns->alias_master_namespace() == target_ns);	368 ASSERT_TRUE(alias_ns->alias_master_namespace() == target_ns);

369 base::NullableString16 read_value = target_ns_area->GetItem(kKey);	369 base::NullableString16 read_value = target_ns_area->GetItem(kKey);

370 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kValue2);	370 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kValue2);

371 DOMStorageArea* alias_ns_area = alias_ns->OpenStorageArea(kOrigin);	371 DOMStorageArea* alias_ns_area = alias_ns->OpenStorageArea(kOrigin);

372 read_value = alias_ns_area->GetItem(kKey2);	372 read_value = alias_ns_area->GetItem(kKey2);

373 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kKey2Value);	373 EXPECT_TRUE(!read_value.is_null() && read_value.string() == kKey2Value);

374 }	374 }

375	375

376 } // namespace content	376 } // namespace content

OLD	NEW