Make sure that a given app/extension requests only its own resources.

chrome/browser/extensions/api/serial/serial_api.cc

Index: chrome/browser/extensions/api/serial/serial_api.cc
diff --git a/chrome/browser/extensions/api/serial/serial_api.cc b/chrome/browser/extensions/api/serial/serial_api.cc
index 87a61c2efee7d4b4a62ff3aa45fb7d56b3139be9..d601f915490270c94228d68864b2fc87f2206e0c 100644
--- a/chrome/browser/extensions/api/serial/serial_api.cc
+++ b/chrome/browser/extensions/api/serial/serial_api.cc
@@ -124,7 +124,7 @@ void SerialOpenFunction::Work() {
     bool open_result = serial_connection->Open();
     if (!open_result) {
       serial_connection->Close();
-      manager_->Remove(id);
+      manager_->Remove(extension_->id(), id);

[Mihai Parparita -not on Chrome, 2012/09/11 07:18:19]

Don't feel too strongly about this, but rather than having to repeat the
extension ID every call-site, you may want to add
GetSocket/RemoveSocket(socketId) protected methods to SerialAsyncApiFunction.

(applies for other APIs too)

       id = -1;
     }
 
@@ -144,7 +144,7 @@ SerialConnection* SerialOpenFunction::CreateSerialConnection(
     const std::string& port,
     int bitrate,
     ApiResourceEventNotifier* event_notifier) {
-  return new SerialConnection(port, bitrate, event_notifier);
+  return new SerialConnection(port, bitrate, extension_->id(), event_notifier);
 }
 
 bool SerialOpenFunction::DoesPortExist(const std::string& port) {
@@ -174,10 +174,11 @@ bool SerialCloseFunction::Prepare() {
 
 void SerialCloseFunction::Work() {
   bool close_result = false;
-  SerialConnection* serial_connection = manager_->Get(params_->connection_id);
+  SerialConnection* serial_connection = manager_->Get(extension_->id(),
+                                                      params_->connection_id);
   if (serial_connection) {
     serial_connection->Close();
-    manager_->Remove(params_->connection_id);
+    manager_->Remove(extension_->id(), params_->connection_id);
     close_result = true;
   }
 
@@ -211,7 +212,8 @@ void SerialReadFunction::Work() {
   int bytes_read = -1;
   scoped_refptr<net::IOBufferWithSize> io_buffer(
       new net::IOBufferWithSize(params_->bytes_to_read));
-  SerialConnection* serial_connection(manager_->Get(params_->connection_id));
+  SerialConnection* serial_connection(manager_->Get(extension_->id(),
+                                                    params_->connection_id));
 
   if (serial_connection)
     bytes_read = serial_connection->Read(io_buffer);
@@ -253,7 +255,8 @@ bool SerialWriteFunction::Prepare() {
 
 void SerialWriteFunction::Work() {
   int bytes_written = -1;
-  SerialConnection* serial_connection = manager_->Get(params_->connection_id);
+  SerialConnection* serial_connection = manager_->Get(extension_->id(),
+                                                      params_->connection_id);
   if (serial_connection)
     bytes_written = serial_connection->Write(io_buffer_, io_buffer_size_);
   else
@@ -284,7 +287,8 @@ bool SerialFlushFunction::Prepare() {
 
 void SerialFlushFunction::Work() {
   bool flush_result = false;
-  SerialConnection* serial_connection = manager_->Get(params_->connection_id);
+  SerialConnection* serial_connection = manager_->Get(extension_->id(),
+                                                      params_->connection_id);
   if (serial_connection) {
     serial_connection->Flush();
     flush_result = true;
@@ -316,7 +320,8 @@ bool SerialGetControlSignalsFunction::Prepare() {
 
 void SerialGetControlSignalsFunction::Work() {
   DictionaryValue *result = new DictionaryValue();
-  SerialConnection* serial_connection = manager_->Get(params_->connection_id);
+  SerialConnection* serial_connection = manager_->Get(extension_->id(),
+                                                      params_->connection_id);
   if (serial_connection) {
     SerialConnection::ControlSignals control_signals = { 0 };
     if (serial_connection->GetControlSignals(control_signals)) {
@@ -355,7 +360,8 @@ bool SerialSetControlSignalsFunction::Prepare() {
 }
 
 void SerialSetControlSignalsFunction::Work() {
-  SerialConnection* serial_connection = manager_->Get(params_->connection_id);
+  SerialConnection* serial_connection = manager_->Get(extension_->id(),
+                                                      params_->connection_id);
   if (serial_connection) {
     SerialConnection::ControlSignals control_signals = { 0 };
     control_signals.should_set_dtr = params_->options.dtr.get() != NULL;