cast channel error cleanup

extensions/browser/api/cast_channel/cast_channel_api.h

 // 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_CAST_CHANNEL_CAST_CHANNEL_API_H_
 #define EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 98 matching lines @@
 
   // Removes the CastSocket corresponding to |channel_id| from the resource
   // manager.
   void RemoveSocket(int channel_id);
 
   // Sets the function result to a ChannelInfo obtained from the state of
   // |socket|.
   void SetResultFromSocket(const cast_channel::CastSocket& socket);
 
   // Sets the function result to a ChannelInfo populated with |channel_id| and
-  // |error|.
-  void SetResultFromError(int channel_id, cast_channel::ChannelError error);
+  // |channel_error|.
+  void SetResultFromError(int channel_id,
+                          cast_channel::ChannelError channel_error);
+
+  // Sets extension lastError to |error| and function result to |channel_error|.
+  void SetChannelError(const std::string& error,
+                       cast_channel::ChannelError channel_error =
+                           cast_channel::CHANNEL_ERROR_UNKNOWN);
 
   // Returns the socket corresponding to |channel_id| if one exists, or null
   // otherwise.
   cast_channel::CastSocket* GetSocket(int channel_id);
 
  private:
   // Sets the function result from |channel_info|.
   void SetResultFromChannelInfo(const cast_channel::ChannelInfo& channel_info);
 
   // The API resource manager for CastSockets.
   ApiResourceManager<cast_channel::CastSocket>* manager_;
 
   // The result of the function.
-  cast_channel::ChannelError error_;
+  cast_channel::ChannelError channel_error_;
 };
 
 class CastChannelOpenFunction : public CastChannelAsyncApiFunction {
  public:
   CastChannelOpenFunction();
 
  protected:
   ~CastChannelOpenFunction() override;
 
   // AsyncApiFunction:
@@ skipping 108 matching lines @@
                              CAST_CHANNEL_SETAUTHORITYKEYS)
 
   scoped_ptr<cast_channel::SetAuthorityKeys::Params> params_;
 
   DISALLOW_COPY_AND_ASSIGN(CastChannelSetAuthorityKeysFunction);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_