Deliver attach intent to packaged apps

chrome/browser/media_gallery/media_storage_util.cc

Index: chrome/browser/media_gallery/media_storage_util.cc
diff --git a/chrome/browser/media_gallery/media_storage_util.cc b/chrome/browser/media_gallery/media_storage_util.cc
index d41f13c508e3f5561c93e06c4a4c8962447cf971..ec5c013fdfdc3fb33a879981baefbcf4c19e218b 100644
--- a/chrome/browser/media_gallery/media_storage_util.cc
+++ b/chrome/browser/media_gallery/media_storage_util.cc
@@ -102,7 +102,10 @@ std::string MediaStorageUtil::MakeDeviceId(Type type,
 bool MediaStorageUtil::CrackDeviceId(const std::string& device_id,
                                      Type* type, std::string* unique_id) {
   size_t prefix_length = device_id.find_first_of(':');
-  std::string prefix = device_id.substr(0, prefix_length);
+  std::string prefix;
+  if (prefix_length != std::string::npos) {

[benwells, 2012/08/28 08:50:51]

Are there instances where there are no colons in the device ID? Could you add a
comment about why this happens?

[thorogood, 2012/08/28 23:48:11]

I don't believe so. The device_id is only something we build internally (where
we guarantee it contains a colon), pass around, and then want to crack apart
again - it's not persisted or anything.

Note that this was previously a bug - all the prefix types (e.g.,
kUsbMassStorageNoDCIMPrefix) contain the colon, so the prefix we were obtaining
didn't contain that, and we'd always hit NOTREACHED below.

The check (the if statement) is mostly because we search for the colon, but grab
a character past that, so that would be bad if we were at std::string::npos...

I've added a short comment for clarification.

+    prefix = device_id.substr(0, prefix_length + 1);
+  }
 
   Type found_type;
   if (prefix == kUsbMassStorageWithDCIMPrefix) {