trunk/src/content/browser/zygote_host/zygote_host_impl_linux.cc - Issue 14824006: Revert 198820 "Move FileEnumerator to its own file, do some refa..."

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

Unified Diff: trunk/src/content/browser/zygote_host/zygote_host_impl_linux.cc

Issue 14824006: Revert 198820 "Move FileEnumerator to its own file, do some refa..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 7 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:

Index: trunk/src/content/browser/zygote_host/zygote_host_impl_linux.cc

===================================================================

--- trunk/src/content/browser/zygote_host/zygote_host_impl_linux.cc (revision 198849)

+++ trunk/src/content/browser/zygote_host/zygote_host_impl_linux.cc (working copy)

@@ -13,7 +13,6 @@

#include "base/command_line.h"

#include "base/environment.h"

#include "base/file_util.h"

-#include "base/files/file_enumerator.h"

#include "base/linux_util.h"

#include "base/logging.h"

#include "base/memory/linked_ptr.h"

@@ -372,7 +371,8 @@

if (!selinux_valid) {

const base::FilePath kSelinuxPath("/selinux");

- base::FileEnumerator en(kSelinuxPath, false, base::FileEnumerator::FILES);

+ file_util::FileEnumerator en(kSelinuxPath, false,

+ file_util::FileEnumerator::FILES);

bool has_selinux_files = !en.Next().empty();

selinux = access(kSelinuxPath.value().c_str(), X_OK) == 0 &&