Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/media_galleries/media_file_system_registry_unittest.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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind_helpers.h"
@@ skipping 314 matching lines @@
                            const base::FilePath& location,
                            bool removable,
                            bool media_device);
 
   std::vector<MediaFileSystemInfo> GetAutoAddedGalleries(
       ProfileState* profile_state);
 
   void ProcessAttach(const std::string& id,
                      const string16& name,
                      const base::FilePath::StringType& location) {
-    StorageInfo info(id, string16(), location, name, string16(), string16(), 0);
+    StorageInfo info(id, location, name, base::string16(), base::string16(), 0);
     StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);
   }
 
   void ProcessDetach(const std::string& id) {
     StorageMonitor::GetInstance()->receiver()->ProcessDetach(id);
   }
 
   MediaFileSystemRegistry* registry() {
     return test_file_system_context_->registry();
   }
@@ skipping 684 matching lines @@
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_VIDEOS, &path));
     profile_state->AddNameForAllCompare(path.BaseName().LossyDisplayName());
 
     profile_state->CheckGalleries("names-dir", one_expectation, auto_galleries);
   } else {
     profile_state->CheckGalleries("names", one_expectation, one_expectation);
   }
 }
 
 }  // namespace chrome