Add CombinedDesktopMediaList class

chrome/browser/media/desktop_media_list_ash_unittest.cc

Index: chrome/browser/media/desktop_media_list_ash_unittest.cc
diff --git a/chrome/browser/media/desktop_media_list_ash_unittest.cc b/chrome/browser/media/desktop_media_list_ash_unittest.cc
index cf8d6f3ec33cb76f7e6feb15f8f8e6159ea46de5..0d63f6df9258646537964a0ecbe476aebda01c8a 100644
--- a/chrome/browser/media/desktop_media_list_ash_unittest.cc
+++ b/chrome/browser/media/desktop_media_list_ash_unittest.cc
@@ -23,11 +23,13 @@ using testing::DoDefault;
 
 class MockDesktopMediaListObserver : public DesktopMediaListObserver {
  public:
-  MOCK_METHOD1(OnSourceAdded, void(int index));
-  MOCK_METHOD1(OnSourceRemoved, void(int index));
-  MOCK_METHOD2(OnSourceMoved, void(int old_index, int new_index));
-  MOCK_METHOD1(OnSourceNameChanged, void(int index));
-  MOCK_METHOD1(OnSourceThumbnailChanged, void(int index));
+  MOCK_METHOD2(OnSourceAdded, void(DesktopMediaList* list, int index));
+  MOCK_METHOD2(OnSourceRemoved, void(DesktopMediaList* list, int index));
+  MOCK_METHOD3(OnSourceMoved,
+               void(DesktopMediaList* list, int old_index, int new_index));
+  MOCK_METHOD2(OnSourceNameChanged, void(DesktopMediaList* list, int index));
+  MOCK_METHOD2(OnSourceThumbnailChanged,
+               void(DesktopMediaList* list, int index));
 };
 
 class DesktopMediaListAshTest : public ash::test::AshTestBase {
@@ -57,8 +59,8 @@ ACTION(QuitMessageLoop) {
 TEST_F(DesktopMediaListAshTest, Screen) {
   CreateList(DesktopMediaListAsh::SCREENS | DesktopMediaListAsh::WINDOWS);
 
-  EXPECT_CALL(observer_, OnSourceAdded(0));
-  EXPECT_CALL(observer_, OnSourceThumbnailChanged(0))
+  EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
+  EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
       .WillOnce(QuitMessageLoop())
       .WillRepeatedly(DoDefault());
   list_->StartUpdating(&observer_);
@@ -70,14 +72,14 @@ TEST_F(DesktopMediaListAshTest, OneWindow) {
 
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
 
-  EXPECT_CALL(observer_, OnSourceAdded(0));
-  EXPECT_CALL(observer_, OnSourceAdded(1));
-  EXPECT_CALL(observer_, OnSourceThumbnailChanged(0))
+  EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
+  EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 1));
+  EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
       .Times(AtLeast(1));
-  EXPECT_CALL(observer_, OnSourceThumbnailChanged(1))
+  EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 1))
       .WillOnce(QuitMessageLoop())
       .WillRepeatedly(DoDefault());
-  EXPECT_CALL(observer_, OnSourceRemoved(1))
+  EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 1))
       .WillOnce(QuitMessageLoop());
 
   list_->StartUpdating(&observer_);
@@ -91,8 +93,8 @@ TEST_F(DesktopMediaListAshTest, ScreenOnly) {
 
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
 
-  EXPECT_CALL(observer_, OnSourceAdded(0));
-  EXPECT_CALL(observer_, OnSourceThumbnailChanged(0))
+  EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
+  EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
       .WillOnce(QuitMessageLoop())
       .WillRepeatedly(DoDefault());
 
@@ -112,11 +114,11 @@ TEST_F(DesktopMediaListAshTest, MAYBE_WindowOnly) {
 
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
 
-  EXPECT_CALL(observer_, OnSourceAdded(0));
-  EXPECT_CALL(observer_, OnSourceThumbnailChanged(0))
+  EXPECT_CALL(observer_, OnSourceAdded(list_.get(), 0));
+  EXPECT_CALL(observer_, OnSourceThumbnailChanged(list_.get(), 0))
       .WillOnce(QuitMessageLoop())
       .WillRepeatedly(DoDefault());
-  EXPECT_CALL(observer_, OnSourceRemoved(0))
+  EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 0))
       .WillOnce(QuitMessageLoop());
 
   list_->StartUpdating(&observer_);