Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/portable_device_watcher_win.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.
 //
 // Any tasks that communicates with the portable device may take >100ms to
 // complete. Those tasks should be run on an blocking thread instead of the
 // UI thread.
 
 #include "chrome/browser/storage_monitor/portable_device_watcher_win.h"
 
@@ skipping 604 matching lines @@
     // Keep track of storage id and storage name to see how often we receive
     // empty values.
     MediaStorageUtil::RecordDeviceInfoHistogram(false, storage_id, name);
     if (storage_id.empty() || name.empty())
       return;
 
     // Device can have several data partitions. Therefore, add the
     // partition identifier to the storage name. E.g.: "Nexus 7 (s10001)"
     string16 storage_name(name + L" (" + storage_iter->object_temporary_id +
         L')');
-    StorageInfo info(storage_id, storage_name, location,
-                     string16(), string16(), string16(), 0);
+    StorageInfo info(storage_id, location, storage_name, base::string16(),
+                     base::string16(), 0);
     storage_map_[storage_id] = info;
     if (storage_notifications_) {
       info.set_location(GetStoragePathFromStorageId(storage_id));
       storage_notifications_->ProcessAttach(info);
     }
   }
   device_map_[location] = storage_objects;
 }
 
 void PortableDeviceWatcherWin::HandleDeviceDetachEvent(
@@ skipping 13 matching lines @@
     if (storage_notifications_) {
       storage_notifications_->ProcessDetach(
           storage_map_iter->second.device_id());
     }
     storage_map_.erase(storage_map_iter);
   }
   device_map_.erase(device_iter);
 }
 
 }  // namespace chrome