chrome/browser/component_updater/test/component_installers_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/component_updater/test/component_installers_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/component_updater/test/cld_component_installer_unittest.cc ('k') | chrome/browser/component_updater/test/component_patcher_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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/component_updater/flash_component_installer.h"	5 #include "chrome/browser/component_updater/flash_component_installer.h"

6	6

7 #include "base/file_util.h"

8 #include "base/files/file_path.h"	7 #include "base/files/file_path.h"

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

9 #include "base/json/json_file_value_serializer.h"	9 #include "base/json/json_file_value_serializer.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

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

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

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

14 #include "build/build_config.h"	14 #include "build/build_config.h"

15 #include "chrome/common/chrome_paths.h"	15 #include "chrome/common/chrome_paths.h"

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

17 #include "ppapi/shared_impl/test_globals.h"	17 #include "ppapi/shared_impl/test_globals.h"

18	18

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 ASSERT_TRUE(root);	79 ASSERT_TRUE(root);

80 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));	80 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));

81	81

82 // This checks that the whole manifest is compatible.	82 // This checks that the whole manifest is compatible.

83 Version version;	83 Version version;

84 EXPECT_TRUE(CheckPepperFlashManifest(*root, &version));	84 EXPECT_TRUE(CheckPepperFlashManifest(*root, &version));

85 EXPECT_TRUE(version.IsValid());	85 EXPECT_TRUE(version.IsValid());

86 }	86 }

87	87

88 } // namespace component_updater	88 } // namespace component_updater

OLD	NEW