Fix bad parameters in base::FileEnumerator's unit tests.

Also adjust FileEnumerator's build rules.

Change-Id: I4a151782f35518f720296c1e5ed3e14910dccfc5
Reviewed-on: https://chromium-review.googlesource.com/1215045Reviewed-by: Alexei Filippov <alph@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590103}

base/BUILD.gn

@@ -278,7 +278,6 @@ jumbo_component("base") {
     "files/file.h",
     "files/file_enumerator.cc",
     "files/file_enumerator.h",
-    "files/file_enumerator_win.cc",
     "files/file_path.cc",
     "files/file_path.h",
     "files/file_path_constants.cc",
@@ -1493,6 +1492,7 @@ jumbo_component("base") {
       "debug/crash_logging.h",
       "debug/stack_trace.cc",
       "debug/stack_trace_posix.cc",
+      "files/file_enumerator.cc",
       "files/file_enumerator_posix.cc",
       "files/file_proxy.cc",
       "files/important_file_writer.cc",
@@ -1597,6 +1597,7 @@ jumbo_component("base") {
   # Windows.
   if (is_win) {
     sources += [
+      "files/file_enumerator_win.cc",
       "memory/platform_shared_memory_region_win.cc",
       "memory/shared_memory_handle_win.cc",
       "memory/shared_memory_win.cc",

base/files/file_enumerator_unittest.cc

@@ -53,7 +53,7 @@ TEST(FileEnumerator, NotExistingPath) {
 
   for (auto policy : kFolderSearchPolicies) {
     const auto files = RunEnumerator(
-        path, true, FileEnumerator::FILES & FileEnumerator::DIRECTORIES,
+        path, true, FileEnumerator::FILES | FileEnumerator::DIRECTORIES,
         FILE_PATH_LITERAL(""), policy);
     EXPECT_THAT(files, IsEmpty());
   }
@@ -66,7 +66,7 @@ TEST(FileEnumerator, EmptyFolder) {
   for (auto policy : kFolderSearchPolicies) {
     const auto files =
         RunEnumerator(temp_dir.GetPath(), true,
-                      FileEnumerator::FILES & FileEnumerator::DIRECTORIES,
+                      FileEnumerator::FILES | FileEnumerator::DIRECTORIES,
                       kEmptyPattern, policy);
     EXPECT_THAT(files, IsEmpty());
   }