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

Side by Side Diff: webrtc/modules/desktop_capture/screen_capturer_unittest.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <memory> 11 #include <memory>
12 12
13 #include "webrtc/base/constructormagic.h"
14 #include "webrtc/base/logging.h"
15 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
13 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" 16 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
14 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
15 #include "webrtc/modules/desktop_capture/desktop_frame.h" 17 #include "webrtc/modules/desktop_capture/desktop_frame.h"
16 #include "webrtc/modules/desktop_capture/desktop_region.h" 18 #include "webrtc/modules/desktop_capture/desktop_region.h"
17 #include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" 19 #include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h"
18 #include "webrtc/rtc_base/constructormagic.h"
19 #include "webrtc/rtc_base/logging.h"
20 #include "webrtc/test/gmock.h" 20 #include "webrtc/test/gmock.h"
21 #include "webrtc/test/gtest.h" 21 #include "webrtc/test/gtest.h"
22 22
23 #if defined(WEBRTC_WIN) 23 #if defined(WEBRTC_WIN)
24 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" 24 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
25 #endif // defined(WEBRTC_WIN) 25 #endif // defined(WEBRTC_WIN)
26 26
27 using ::testing::_; 27 using ::testing::_;
28 28
29 const int kTestSharedMemoryId = 123; 29 const int kTestSharedMemoryId = 123;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory())); 199 std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory()));
200 capturer_->CaptureFrame(); 200 capturer_->CaptureFrame();
201 ASSERT_TRUE(frame); 201 ASSERT_TRUE(frame);
202 ASSERT_TRUE(frame->shared_memory()); 202 ASSERT_TRUE(frame->shared_memory());
203 EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId); 203 EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId);
204 } 204 }
205 205
206 #endif // defined(WEBRTC_WIN) 206 #endif // defined(WEBRTC_WIN)
207 207
208 } // namespace webrtc 208 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698