Separate validation failures from other failures in ExecuteCodeFunction.

extensions/browser/api/execute_code_function.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 #define EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 
 #include "extensions/browser/api/execute_code_function.h"
 
 #include "extensions/browser/component_extension_resource_manager.h"
@@ skipping 145 matching lines @@
                      : ScriptExecutor::NO_RESULT,
       base::Bind(&ExecuteCodeFunction::OnExecuteCodeFinished, this));
   return true;
 }
 
 bool ExecuteCodeFunction::HasPermission() {
   return true;
 }
 
 bool ExecuteCodeFunction::RunAsync() {
-  EXTENSION_FUNCTION_VALIDATE(Init());
+  InitResult init_result = Init();
+  EXTENSION_FUNCTION_VALIDATE(init_result != VALIDATION_FAILURE);
+  if (init_result == FAILURE) {
+    if (init_error_)
+      error_ = init_error_.value();

[Devlin, 2017/01/24 16:09:05]

nit: since you're here, may as well make this SetError()

[lazyboy, 2017/01/24 23:36:07]

Done.

+    return false;
+  }
 
   if (!details_->code.get() && !details_->file.get()) {
     error_ = kNoCodeOrFileToExecuteError;
     return false;
   }
   if (details_->code.get() && details_->file.get()) {
     error_ = kMoreThanOneValuesError;
     return false;
   }
 
@@ skipping 68 matching lines @@
                                                 const base::ListValue& result) {
   if (!error.empty())
     SetError(error);
 
   SendResponse(error.empty());
 }
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_