Use new ExtensionFunction::Error(..) error syntax in automation internal API.

chrome/browser/extensions/api/automation_internal/automation_internal_api.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.
 
 #include "chrome/browser/extensions/api/automation_internal/automation_internal_api.h"
 
 #include <vector>
 
 #include "chrome/browser/extensions/api/automation_internal/automation_action_adapter.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/automation_internal.h"
 #include "chrome/common/extensions/manifest_handlers/automation.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/common/error_utils.h"
 #include "extensions/common/permissions/permissions_data.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/ash/accessibility/automation_manager_ash.h"
 #endif
 
 namespace extensions {
 class AutomationWebContentsObserver;
 }  // namespace extensions
 
@@ skipping 102 matching lines @@
   content::WebContents* contents =
       tab_strip->GetWebContentsAt(tab_strip->active_index());
   if (!contents)
     return RespondNow(Error("No active tab"));
   content::RenderWidgetHost* rwh =
       contents->GetRenderWidgetHostView()->GetRenderWidgetHost();
   if (!rwh)
     return RespondNow(Error("Could not enable accessibility for active tab"));
 
   if (!CanRequestAutomation(GetExtension(), automation_info, contents)) {
-    return RespondNow(Error(ErrorUtils::FormatErrorMessage(
-        kCannotRequestAutomationOnPage, contents->GetURL().spec())));
+    return RespondNow(
+        Error(kCannotRequestAutomationOnPage, contents->GetURL().spec()));
   }
   AutomationWebContentsObserver::CreateForWebContents(contents);
   rwh->EnableTreeOnlyAccessibilityMode();
   return RespondNow(
       ArgumentList(api::automation_internal::EnableCurrentTab::Results::Create(
           rwh->GetProcess()->GetID(), rwh->GetRoutingID())));
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalPerformActionFunction::Run() {
@@ skipping 18 matching lines @@
   content::RenderWidgetHost* rwh = content::RenderWidgetHost::FromID(
       params->args.process_id, params->args.routing_id);
 
   if (!rwh)
     return RespondNow(Error("Ignoring action on destroyed node"));
   if (rwh->IsRenderView()) {
     const content::RenderViewHost* rvh = content::RenderViewHost::From(rwh);
     const content::WebContents* contents =
         content::WebContents::FromRenderViewHost(rvh);
     if (!CanRequestAutomation(GetExtension(), automation_info, contents)) {
-      return RespondNow(Error(ErrorUtils::FormatErrorMessage(
-          kCannotRequestAutomationOnPage, contents->GetURL().spec())));
+      return RespondNow(
+          Error(kCannotRequestAutomationOnPage, contents->GetURL().spec()));
     }
   }
   RenderWidgetHostActionAdapter adapter(rwh);
   return RouteActionToAdapter(params.get(), &adapter);
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalPerformActionFunction::RouteActionToAdapter(
     api::automation_internal::PerformAction::Params* params,
     AutomationActionAdapter* adapter) {
@@ skipping 32 matching lines @@
     return RespondNow(Error("desktop permission must be requested"));
 
   AutomationManagerAsh::GetInstance()->Enable(browser_context());
   return RespondNow(NoArguments());
 #else
   return RespondNow(Error("getDesktop is unsupported by this platform"));
 #endif  // defined(OS_CHROMEOS)
 }
 
 }  // namespace extensions