[MediaGalleries] Add temp dir adjustment in windows unit test.

chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc

 // Copyright (c) 2013 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 "chrome/browser/storage_monitor/test_volume_mount_watcher_win.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 
 namespace chrome {
 namespace test {
 
 namespace {
 
 std::vector<base::FilePath> FakeGetSingleAttachedDevice() {
   std::vector<base::FilePath> result;
   result.push_back(VolumeMountWatcherWin::DriveNumberToFilePath(2));  // C
+
+  // Make sure we are adding the drive on which ScopedTempDir will make
+  // test directories.
+  base::ScopedTempDir temp_dir;
+  temp_dir.CreateUniqueTempDir();
+  base::FilePath temp_root = temp_dir.path();
+  while (temp_root.DirName() != temp_root)
+    temp_root = temp_root.DirName();
+  if (temp_root != VolumeMountWatcherWin::DriveNumberToFilePath(2))
+    result.push_back(temp_root);
+
   return result;
 }
 
 std::vector<base::FilePath> FakeGetAttachedDevices() {
   std::vector<base::FilePath> result;
   result.push_back(VolumeMountWatcherWin::DriveNumberToFilePath(0));  // A
   result.push_back(VolumeMountWatcherWin::DriveNumberToFilePath(1));  // B
   result.push_back(VolumeMountWatcherWin::DriveNumberToFilePath(2));  // C
   result.push_back(VolumeMountWatcherWin::DriveNumberToFilePath(3));  // D
   result.push_back(VolumeMountWatcherWin::DriveNumberToFilePath(5));  // F
@@ skipping 10 matching lines @@
                                  StorageInfo* 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') {
     return false;
   }
 
+  base::ScopedTempDir temp_dir;

[vandebo (ex-Chrome), 2013/05/28 16:10:43]

nit: looks like this chunk could get pull into a helper function.

[Greg Billock, 2013/05/29 17:23:59]

Yeah, I pondered that. I'll go ahead and do it.

+  temp_dir.CreateUniqueTempDir();
+  base::FilePath temp_root = temp_dir.path();
+  while (temp_root.DirName() != temp_root)
+    temp_root = temp_root.DirName();
+
   if (info) {
     info->location = path.value();
     info->total_size_in_bytes = 1000000;
 
     std::string unique_id =
         "\\\\?\\Volume{00000000-0000-0000-0000-000000000000}\\";
     unique_id[11] = device_path.value()[0];
     chrome::StorageInfo::Type type = chrome::StorageInfo::FIXED_MASS_STORAGE;
     if (path.value() != ASCIIToUTF16("N:\\") &&
-        path.value() != ASCIIToUTF16("C:\\")) {
+        path.value() != ASCIIToUTF16("C:\\") &&
+        path.value() != temp_root.value()) {
       type = chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM;
     }
     info->device_id = chrome::StorageInfo::MakeDeviceId(type, unique_id);
     info->storage_label = path.Append(L" Drive").LossyDisplayName();
   }
 
   return true;
 }
 
 } // namespace
@@ skipping 65 matching lines @@
 
   return base::Bind(&FakeGetSingleAttachedDevice);
 }
 
 void TestVolumeMountWatcherWin::ShutdownWorkerPool() {
   device_info_worker_pool_->Shutdown();
 }
 
 }  // namespace test
 }  // namespace chrome