Clean up MediaStorageUtil

chrome/browser/media_gallery/media_galleries_preferences_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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 18 matching lines @@
 
 namespace {
 
 class MediaStorageUtilTest : public MediaStorageUtil {
  public:
   static void SetTestingMode() {
     SetGetDeviceInfoFromPathFunctionForTesting(
         &GetDeviceInfoFromPathTestFunction);
   }
 
-  static void GetDeviceInfoFromPathTestFunction(const FilePath& path,
+  static bool GetDeviceInfoFromPathTestFunction(const FilePath& path,
                                                 std::string* device_id,
                                                 string16* device_name,
                                                 FilePath* relative_path) {
     if (device_id)
       *device_id = MakeDeviceId(FIXED_MASS_STORAGE, path.AsUTF8Unsafe());
     if (device_name)
       *device_name = path.BaseName().LossyDisplayName();
     if (relative_path)
       *relative_path = FilePath();
+    return true;
   }
 };
 
 class MediaGalleriesPreferencesTest : public testing::Test {
  public:
   typedef std::map<std::string /*device id*/, MediaGalleryPrefIdSet>
       DeviceIdPrefIdsMap;
 
   MediaGalleriesPreferencesTest()
       : ui_thread_(content::BrowserThread::UI, &loop_),
@@ skipping 468 matching lines @@
   // Check that adding one of them again works as expected.
   MediaGalleryPrefId id = gallery_prefs()->AddGallery(
       device_id, device_name, relative_path, true /*user*/);
   EXPECT_EQ(dev2_path2_id, id);
   Verify();
 }
 
 }  // namespace
 
 }  // namespace chrome