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

Side by Side Diff: chrome/browser/media/webrtc/desktop_media_list_ash_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/desktop_media_list_ash.h" 5 #include "chrome/browser/media/webrtc/desktop_media_list_ash.h"
6 6
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/threading/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "chrome/browser/media/desktop_media_list_observer.h" 14 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
15 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/aura/window.h" 17 #include "ui/aura/window.h"
18 18
19 int kThumbnailSize = 100; 19 int kThumbnailSize = 100;
20 20
21 using testing::AtLeast; 21 using testing::AtLeast;
22 using testing::DoDefault; 22 using testing::DoDefault;
23 23
24 class MockDesktopMediaListObserver : public DesktopMediaListObserver { 24 class MockDesktopMediaListObserver : public DesktopMediaListObserver {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 .WillOnce(QuitMessageLoop()) 119 .WillOnce(QuitMessageLoop())
120 .WillRepeatedly(DoDefault()); 120 .WillRepeatedly(DoDefault());
121 EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 0)) 121 EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 0))
122 .WillOnce(QuitMessageLoop()); 122 .WillOnce(QuitMessageLoop());
123 123
124 list_->StartUpdating(&observer_); 124 list_->StartUpdating(&observer_);
125 base::MessageLoop::current()->Run(); 125 base::MessageLoop::current()->Run();
126 window.reset(); 126 window.reset();
127 base::MessageLoop::current()->Run(); 127 base::MessageLoop::current()->Run();
128 } 128 }
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc/desktop_media_list_ash.cc ('k') | chrome/browser/media/webrtc/desktop_media_list_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698