Type conversion fixes, components/ edition.

components/storage_monitor/test_volume_mount_watcher_win.cc

 // Copyright 2014 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.
 //
 // TestVolumeMountWatcherWin implementation.
 
 #include "components/storage_monitor/test_volume_mount_watcher_win.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 44 matching lines @@
 // |device_path| inputs of 'A:\' - 'Z:\' are valid. 'N:\' is not removable.
 // 'C:\' is not removable (so that auto-added paths are correctly handled).
 bool GetMassStorageDeviceDetails(const base::FilePath& device_path,
                                  StorageInfo* info) {
   DCHECK(info);
 
   // Truncate to root path.
   base::FilePath path(device_path);
   if (device_path.value().length() > 3)
     path = base::FilePath(device_path.value().substr(0, 3));
-  if (path.value()[0] < L'A' || path.value()[0] > L'Z')
+  base::FilePath::CharType drive_letter = path.value()[0];
+  if (drive_letter < L'A' || drive_letter > L'Z')
     return false;
 
   StorageInfo::Type type = StorageInfo::FIXED_MASS_STORAGE;
   if (path.value() != base::ASCIIToUTF16("N:\\") &&
       path.value() != base::ASCIIToUTF16("C:\\") &&
       path.value() != GetTempRoot().value()) {
     type = StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM;
   }
   std::string unique_id =
       "\\\\?\\Volume{00000000-0000-0000-0000-000000000000}\\";
-  unique_id[11] = device_path.value()[0];
+  unique_id[11] = static_cast<char>(drive_letter);
   std::string device_id = StorageInfo::MakeDeviceId(type, unique_id);
   base::string16 storage_label = path.Append(L" Drive").LossyDisplayName();
   *info = StorageInfo(device_id, path.value(), storage_label, base::string16(),
                       base::string16(), 1000000);
 
   return true;
 }
 
 }  // namespace
 
@@ skipping 60 matching lines @@
   if (attached_devices_fake_)
     return base::Bind(&FakeGetAttachedDevices);
   return base::Bind(&FakeGetSingleAttachedDevice);
 }
 
 void TestVolumeMountWatcherWin::ShutdownWorkerPool() {
   device_info_worker_pool_->Shutdown();
 }
 
 }  // namespace storage_monitor