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

Side by Side Diff: chrome/browser/media/webrtc/native_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 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/native_desktop_media_list.h" 5 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string.h> 9 #include <string.h>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/synchronization/lock.h" 17 #include "base/synchronization/lock.h"
18 #include "chrome/browser/media/desktop_media_list_observer.h" 18 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
19 #include "content/public/test/test_browser_thread.h" 19 #include "content/public/test/test_browser_thread.h"
20 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" 22 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
23 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" 23 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
24 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h" 24 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
25 #include "ui/aura/window.h" 25 #include "ui/aura/window.h"
26 #include "ui/aura/window_tree_host.h" 26 #include "ui/aura/window_tree_host.h"
27 #include "ui/views/test/views_test_base.h" 27 #include "ui/views/test/views_test_base.h"
28 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 28 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 QuitMessageLoop(message_loop()))); 508 QuitMessageLoop(message_loop())));
509 509
510 // Swap the two windows. 510 // Swap the two windows.
511 webrtc::WindowCapturer::Window temp = window_list_[0]; 511 webrtc::WindowCapturer::Window temp = window_list_[0];
512 window_list_[0] = window_list_[1]; 512 window_list_[0] = window_list_[1];
513 window_list_[1] = temp; 513 window_list_[1] = temp;
514 window_capturer_->SetWindowList(window_list_); 514 window_capturer_->SetWindowList(window_list_);
515 515
516 base::RunLoop().Run(); 516 base::RunLoop().Run();
517 } 517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698