commit 08f574e5254fa87c80ce0f35be3ab25fdfc5958c
author John Grossman <johngro@google.com> Tue Sep 22 16:57:57 2015 -0700
committer John Grossman <johngro@google.com> Tue Sep 22 16:57:57 2015 -0700
tree 79bbf0b0261b2b52d192b939a171f3ba2e93c372
parent 5a005409787cc238c61a34420a50f174b335d9cb

enum class fixups - testing non-zero

Fixups in preparation for changing the mojom C++ binding generator to
produce enum classes instead of just enums.  Specifically, address
issues where enums were being tested for truth by assuming that they
would be implicitly converted to ints and checked for non-zero-ness.

BUG=
R=viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/1355403002 .

services/files/directory_impl.cc

diff --git a/services/files/directory_impl.cc b/services/files/directory_impl.cc
index 279c3bd..40aa33c 100644
--- a/services/files/directory_impl.cc
+++ b/services/files/directory_impl.cc
@@ -190,14 +190,16 @@
   DCHECK(!path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  Error error = IsPathValid(path);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }
   // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate).
   // TODO(vtl): Maybe allow absolute paths?
 
-  if (Error error = ValidateOpenFlags(open_flags, false)) {
+  error = ValidateOpenFlags(open_flags, false);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }
@@ -235,14 +237,16 @@
   DCHECK(!path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  Error error = IsPathValid(path);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }
   // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate).
   // TODO(vtl): Maybe allow absolute paths?
 
-  if (Error error = ValidateOpenFlags(open_flags, false)) {
+  error = ValidateOpenFlags(open_flags, false);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }
@@ -284,11 +288,14 @@
   DCHECK(!new_path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  Error error = IsPathValid(path);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }
-  if (Error error = IsPathValid(new_path)) {
+
+  error = IsPathValid(new_path);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }
@@ -309,13 +316,15 @@
   DCHECK(!path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  Error error = IsPathValid(path);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }
   // TODO(vtl): See TODOs about |path| in OpenFile().
 
-  if (Error error = ValidateDeleteFlags(delete_flags)) {
+  error = ValidateDeleteFlags(delete_flags);
+  if (error != ERROR_OK) {
     callback.Run(error);
     return;
   }