Merge r255817 and r257069: Do not initialize volume manager for signin profiles.

chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

 // Copyright 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.
 
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 357 matching lines @@
   const LoggingObserver::Event& event = observer.events()[0];
   EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, event.type);
   EXPECT_EQ("device1", event.device_path);
 
   ASSERT_EQ(0U, disk_mount_manager_->unmount_requests().size());
 
   volume_manager_->RemoveObserver(&observer);
 }
 
 TEST_F(VolumeManagerTest, OnDiskEvent_Changed) {
-  // Changed event is just ignored.
+  // Changed event should cause mounting (if possible).
   LoggingObserver observer;
   volume_manager_->AddObserver(&observer);
 
   const chromeos::disks::DiskMountManager::Disk kDisk(
       "device1", "", "", "", "", "", "", "", "", "", "", "",
-      chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, false);
+      chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, true, false, false);
   volume_manager_->OnDiskEvent(
       chromeos::disks::DiskMountManager::DISK_CHANGED, &kDisk);
 
-  EXPECT_EQ(0U, observer.events().size());
-  EXPECT_EQ(0U, disk_mount_manager_->mount_requests().size());
+  EXPECT_EQ(1U, observer.events().size());
+  EXPECT_EQ(1U, disk_mount_manager_->mount_requests().size());
   EXPECT_EQ(0U, disk_mount_manager_->unmount_requests().size());
 
   volume_manager_->RemoveObserver(&observer);
 }
 
 TEST_F(VolumeManagerTest, OnDeviceEvent_Added) {
   LoggingObserver observer;
   volume_manager_->AddObserver(&observer);
 
   volume_manager_->OnDeviceEvent(
@@ skipping 265 matching lines @@
   VolumeInfo volume_info;
   ASSERT_FALSE(volume_manager_->FindVolumeInfoById(
       "nonexistent", &volume_info));
   ASSERT_TRUE(volume_manager_->FindVolumeInfoById(
       "downloads:Downloads", &volume_info));
   EXPECT_EQ("downloads:Downloads", volume_info.volume_id);
   EXPECT_EQ(VOLUME_TYPE_DOWNLOADS_DIRECTORY, volume_info.type);
 }
 
 }  // namespace file_manager