- Changed the data structure being passed around in the socket API from a string to an array of longs. This is a stepping stone to get us to ArrayBuffers.

- Changed "message" key to "data" for consistency.

BUG=120567
TEST=no new ones, but existing, as updated, still pass.

Review URL: http://codereview.chromium.org/10095020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132512 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/extensions/api/serial/serial_api.cc b/chrome/browser/extensions/api/serial/serial_api.cc
index 26b523f..c99c456 100644
--- a/chrome/browser/extensions/api/serial/serial_api.cc
+++ b/chrome/browser/extensions/api/serial/serial_api.cc
@@ -13,7 +13,7 @@
 namespace extensions {
 
 const char kConnectionIdKey[] = "connectionId";
-const char kMessageKey[] = "message";
+const char kDataKey[] = "data";
 const char kBytesReadKey[] = "bytesRead";
 const char kBytesWrittenKey[] = "bytesWritten";
 
@@ -81,19 +81,19 @@ bool SerialReadFunction::Prepare() {
 
 void SerialReadFunction::Work() {
   int bytes_read = -1;
-  std::string message;
+  std::string data;
   SerialConnection* serial_connection =
       controller()->GetSerialConnection(connection_id_);
   if (serial_connection) {
     unsigned char byte = '\0';
     bytes_read = serial_connection->Read(&byte);
     if (bytes_read == 1)
-      message = byte;
+      data = byte;
   }
 
   DictionaryValue* result = new DictionaryValue();
   result->SetInteger(kBytesReadKey, bytes_read);
-  result->SetString(kMessageKey, message);
+  result->SetString(kDataKey, data);
   result_.reset(result);
 }