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

Side by Side Diff: chrome/browser/media/combined_desktop_media_list_unittest.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/media/combined_desktop_media_list.h" 5 #include "chrome/browser/media/combined_desktop_media_list.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/media/desktop_media_list_base.h" 11 #include "chrome/browser/media/webrtc/desktop_media_list_base.h"
12 #include "chrome/browser/media/desktop_media_list_observer.h" 12 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
13 #include "content/public/test/test_browser_thread.h" 13 #include "content/public/test/test_browser_thread.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "ui/gfx/image/image_skia.h" 16 #include "ui/gfx/image/image_skia.h"
17 17
18 using testing::DoAll; 18 using testing::DoAll;
19 using content::DesktopMediaID; 19 using content::DesktopMediaID;
20 20
21 static const int kThumbnailSize = 50; 21 static const int kThumbnailSize = 50;
22 static const int kDefaultSourceCount = 2; 22 static const int kDefaultSourceCount = 2;
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 list2_->AddFakeSource(kDefaultSourceCount - 1, 378 list2_->AddFakeSource(kDefaultSourceCount - 1,
379 base::UTF8ToUTF16("Test media"), 100); 379 base::UTF8ToUTF16("Test media"), 100);
380 380
381 EXPECT_CALL(observer_, OnSourceThumbnailChanged(combined_list_.get(), 381 EXPECT_CALL(observer_, OnSourceThumbnailChanged(combined_list_.get(),
382 2 * kDefaultSourceCount - 1)) 382 2 * kDefaultSourceCount - 1))
383 .WillOnce(QuitMessageLoop(&message_loop_)); 383 .WillOnce(QuitMessageLoop(&message_loop_));
384 384
385 list2_->Refresh(); 385 list2_->Refresh();
386 base::RunLoop().Run(); 386 base::RunLoop().Run();
387 } 387 }
OLDNEW
« no previous file with comments | « chrome/browser/media/combined_desktop_media_list.h ('k') | chrome/browser/media/desktop_capture_access_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698