Clean up: Use StringPrintf instead of string concatenation operator.

chrome/browser/system_monitor/media_transfer_protocol_device_observer_chromeos.cc

 // Copyright (c) 2012 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/system_monitor/media_transfer_protocol_device_observer_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 55 matching lines @@
       chrome::kNonSpaceDelim,
       model_id.c_str(),
       chrome::kNonSpaceDelim,
       volume_id.c_str(),
       chrome::kNonSpaceDelim,
       storage_id.c_str());
   return MediaStorageUtil::MakeDeviceId(MediaStorageUtil::MTP_OR_PTP,
                                         unique_id);
 }
 
+// Returns the |data_store_id| string in the required format.
+// If the |data_store_id| is 65537, this function returns "(65537)".
+std::string GetFormattedIdString(const std::string& data_store_id) {
+  return base::StringPrintf("%s%s%s",

[Lei Zhang, 2012/09/19 19:03:32]

Please format this function call correctly.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Functi...

[kmadhusu, 2012/09/19 19:06:05]

Done.

+                            chrome::kLeftParen, data_store_id.c_str(),
+                            chrome::kRightParen);
+}
+
 // Helper function to get device label from storage information.
 string16 GetDeviceLabelFromStorageInfo(const MtpStorageInfo& storage_info) {
   std::string device_label;
   const std::string& vendor_name = storage_info.vendor();
   device_label = vendor_name;
 
   const std::string& product_name = storage_info.product();
   if (!product_name.empty()) {
     if (!device_label.empty())
       device_label += chrome::kSpaceDelim;
     device_label += product_name;
   }
 
   // Add the data store id to the device label.
   if (!device_label.empty()) {
     const std::string& volume_id = storage_info.volume_identifier();
     if (!volume_id.empty()) {
-      // TODO(kmadhusu): Use StringPrintf here and on line 98.
-      device_label += chrome::kLeftParen + volume_id + chrome::kRightParen;
+      device_label += GetFormattedIdString(volume_id);
     } else {
       const std::string data_store_id =
           GetStorageIdFromStorageName(storage_info.storage_name());
-      if (!data_store_id.empty()) {
-        device_label += chrome::kLeftParen + data_store_id +
-                        chrome::kRightParen;
-      }
+      if (!data_store_id.empty())
+        device_label += GetFormattedIdString(data_store_id);
     }
   }
   return UTF8ToUTF16(device_label);
 }
 
 // Helper function to get the device storage details such as device id, label
 // and location. On success and fills in |id|, |label| and |location|.
 void GetStorageInfo(const std::string& storage_name,
                     std::string* id,
                     string16* label,
@@ skipping 134 matching lines @@
   DCHECK(mtp_manager);
   StorageList storages = mtp_manager->GetStorages();
   for (StorageList::const_iterator storage_iter = storages.begin();
        storage_iter != storages.end(); ++storage_iter) {
     StorageChanged(true, *storage_iter);
   }
 }
 
 }  // namespace mtp
 }  // namespace chromeos