Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media_gallery/media_device_notifications_linux_unittest.cc

Issue 10873072: Rename SystemMonitor's MediaDevice calls to RemovableStorage. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media_gallery/media_device_notifications_linux.cc ('k') | chrome/browser/media_gallery/media_device_notifications_window_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_gallery/media_device_notifications_linux_unittest.cc
===================================================================
--- chrome/browser/media_gallery/media_device_notifications_linux_unittest.cc (revision 153336)
+++ chrome/browser/media_gallery/media_device_notifications_linux_unittest.cc (working copy)
@@ -272,14 +272,15 @@
};
// Only |kDevice2| should be attached, since |kDevice1| has a bad path.
EXPECT_CALL(observer(),
- OnMediaDeviceAttached(GetDCIMDeviceId(kDeviceId2),
- ASCIIToUTF16(kDeviceLabel2),
- test_path.value()))
+ OnRemovableStorageAttached(GetDCIMDeviceId(kDeviceId2),
+ ASCIIToUTF16(kDeviceLabel2),
+ test_path.value()))
.InSequence(mock_sequence);
AppendToMtabAndRunLoop(test_data, arraysize(test_data));
// |kDevice2| should be detached here.
- EXPECT_CALL(observer(), OnMediaDeviceDetached(GetDCIMDeviceId(kDeviceId2)))
+ EXPECT_CALL(observer(),
+ OnRemovableStorageDetached(GetDCIMDeviceId(kDeviceId2)))
.InSequence(mock_sequence);
WriteEmptyMtabAndRunLoop();
}
@@ -294,9 +295,9 @@
};
// |kDevice1| should be attached as expected.
EXPECT_CALL(observer(),
- OnMediaDeviceAttached(GetDCIMDeviceId(kDeviceId1),
- ASCIIToUTF16(kDeviceLabel1),
- test_path_a.value()))
+ OnRemovableStorageAttached(GetDCIMDeviceId(kDeviceId1),
+ ASCIIToUTF16(kDeviceLabel1),
+ test_path_a.value()))
.InSequence(mock_sequence);
AppendToMtabAndRunLoop(test_data1, arraysize(test_data1));
@@ -309,7 +310,8 @@
AppendToMtabAndRunLoop(test_data2, arraysize(test_data2));
// |kDevice1| should be detached as expected.
- EXPECT_CALL(observer(), OnMediaDeviceDetached(GetDCIMDeviceId(kDeviceId1)))
+ EXPECT_CALL(observer(),
+ OnRemovableStorageDetached(GetDCIMDeviceId(kDeviceId1)))
.InSequence(mock_sequence);
WriteEmptyMtabAndRunLoop();
}
@@ -328,8 +330,8 @@
MtabTestData(kDevice1, test_path_a.value(), kValidFS),
MtabTestData(kDevice2, test_path_b.value(), kValidFS),
};
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(2);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(0);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(0);
AppendToMtabAndRunLoop(test_data1, arraysize(test_data1));
// Detach two devices from old mount points and attach the devices at new
@@ -340,13 +342,13 @@
MtabTestData(kDevice1, test_path_b.value(), kValidFS),
MtabTestData(kDevice2, test_path_a.value(), kValidFS),
};
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(2);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(2);
OverwriteMtabAndRunLoop(test_data2, arraysize(test_data2));
// Detach all devices.
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(2);
WriteEmptyMtabAndRunLoop();
}
@@ -364,8 +366,8 @@
MtabTestData(kDevice1, test_path_a.value(), kValidFS),
MtabTestData(kDevice2, test_path_b.value(), kValidFS),
};
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(2);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(0);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(0);
AppendToMtabAndRunLoop(test_data1, arraysize(test_data1));
// Attach |kDevice1| to |kMountPointB|.
@@ -377,8 +379,8 @@
MtabTestData test_data2[] = {
MtabTestData(kDevice1, test_path_b.value(), kValidFS),
};
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(1);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(1);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(2);
AppendToMtabAndRunLoop(test_data2, arraysize(test_data2));
// Attach |kDevice2| to |kMountPointA|.
@@ -389,8 +391,8 @@
MtabTestData test_data3[] = {
MtabTestData(kDevice2, test_path_a.value(), kValidFS),
};
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(1);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(0);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(1);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(0);
AppendToMtabAndRunLoop(test_data3, arraysize(test_data3));
// Detach |kDevice2| from |kMountPointA|.
@@ -402,20 +404,20 @@
MtabTestData(kDevice2, test_path_b.value(), kValidFS),
MtabTestData(kDevice1, test_path_b.value(), kValidFS),
};
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(1);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(1);
OverwriteMtabAndRunLoop(test_data4, arraysize(test_data4));
// Detach |kDevice1| from |kMountPointB|.
// kDevice1 -> kMountPointA
// kDevice2 -> kMountPointB
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(2);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(1);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(1);
OverwriteMtabAndRunLoop(test_data1, arraysize(test_data1));
// Detach all devices.
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(2);
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(2);
WriteEmptyMtabAndRunLoop();
}
@@ -436,11 +438,11 @@
MtabTestData(kDevice1, test_path_b.value(), kValidFS),
};
EXPECT_CALL(observer(),
- OnMediaDeviceAttached(GetDCIMDeviceId(kDeviceId1),
- ASCIIToUTF16(kDeviceLabel1),
- test_path_b.value()))
+ OnRemovableStorageAttached(GetDCIMDeviceId(kDeviceId1),
+ ASCIIToUTF16(kDeviceLabel1),
+ test_path_b.value()))
.Times(1);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(0);
+ EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(0);
OverwriteMtabAndRunLoop(test_data1, arraysize(test_data1));
// Attach |kDevice3| to |kMountPointB|.
@@ -454,18 +456,20 @@
MtabTestData test_data2[] = {
MtabTestData(kDevice3, test_path_b.value(), kValidFS),
};
- EXPECT_CALL(observer(), OnMediaDeviceDetached(GetDCIMDeviceId(kDeviceId1)))
+ EXPECT_CALL(observer(),
+ OnRemovableStorageDetached(GetDCIMDeviceId(kDeviceId1)))
.Times(1);
EXPECT_CALL(observer(),
- OnMediaDeviceAttached(GetDCIMDeviceId(kDeviceId3),
- ASCIIToUTF16(kDeviceLabel3),
- test_path_b.value()))
+ OnRemovableStorageAttached(GetDCIMDeviceId(kDeviceId3),
+ ASCIIToUTF16(kDeviceLabel3),
+ test_path_b.value()))
.Times(1);
AppendToMtabAndRunLoop(test_data2, arraysize(test_data2));
// Detach all devices.
- EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
- EXPECT_CALL(observer(), OnMediaDeviceDetached(GetDCIMDeviceId(kDeviceId3)))
+ EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
+ EXPECT_CALL(observer(),
+ OnRemovableStorageDetached(GetDCIMDeviceId(kDeviceId3)))
.Times(1);
WriteEmptyMtabAndRunLoop();
}
« no previous file with comments | « chrome/browser/media_gallery/media_device_notifications_linux.cc ('k') | chrome/browser/media_gallery/media_device_notifications_window_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698