Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/image_capture_device_manager.mm

 // 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/storage_monitor/image_capture_device_manager.h"
 
 #import <ImageCaptureCore/ImageCaptureCore.h>
 
 #import "chrome/browser/storage_monitor/image_capture_device.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
@@ skipping 84 matching lines @@
   ICCameraDevice* cameraDevice =
       base::mac::ObjCCastStrict<ICCameraDevice>(addedDevice);
 
   [cameras_ addObject:addedDevice];
 
   // TODO(gbillock): use [cameraDevice mountPoint] here when possible.
   chrome::StorageInfo info(
       chrome::StorageInfo::MakeDeviceId(
           chrome::StorageInfo::MAC_IMAGE_CAPTURE,
           base::SysNSStringToUTF8([cameraDevice UUIDString])),
+      std::string(),
       base::SysNSStringToUTF16([cameraDevice name]),
-      "",
-      string16(),
-      string16(),
-      string16(),
+      base::string16(),
+      base::string16(),
       0);
   notifications_->ProcessAttach(info);
 }
 
 - (void)deviceBrowser:(ICDeviceBrowser*)browser
       didRemoveDevice:(ICDevice*)device
             moreGoing:(BOOL)moreGoing {
   if (!(device.type & ICDeviceTypeCamera))
     return;
 
@@ skipping 32 matching lines @@
   ImageCaptureDeviceManagerImpl* manager =
       g_image_capture_device_manager->device_browser_;
   return [manager deviceForUUID:uuid];
 }
 
 id<ICDeviceBrowserDelegate> ImageCaptureDeviceManager::device_browser() {
   return device_browser_.get();
 }
 
 }  // namespace chrome