chrome/browser/extensions/extension_garbage_collector_chromeos_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/extensions/extension_garbage_collector_chromeos_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/extensions/extension_garbage_collector.cc ('k') | chrome/browser/extensions/extension_garbage_collector_unittest.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 "base/file_util.h"	5 #include "base/files/file_util.h"

6 #include "base/prefs/scoped_user_pref_update.h"	6 #include "base/prefs/scoped_user_pref_update.h"

7 #include "base/prefs/testing_pref_service.h"	7 #include "base/prefs/testing_pref_service.h"

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

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

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

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

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

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

14 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"	14 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"

15 #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"	15 #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"

(...skipping 175 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
191	191

192 const base::DictionaryValue* shared_extensions = local_state().GetDictionary(	192 const base::DictionaryValue* shared_extensions = local_state().GetDictionary(

193 ExtensionAssetsManagerChromeOS::kSharedExtensions);	193 ExtensionAssetsManagerChromeOS::kSharedExtensions);

194 ASSERT_TRUE(shared_extensions);	194 ASSERT_TRUE(shared_extensions);

195	195

196 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1));	196 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1));

197 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2));	197 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2));

198 }	198 }

199	199

200 } // namespace extensions	200 } // namespace extensions

OLD	NEW