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

Side by Side Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.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 <array> 5 #include <array>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/threading/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h" 13 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h"
14 #include "chrome/browser/extensions/extension_apitest.h" 14 #include "chrome/browser/extensions/extension_apitest.h"
15 #include "chrome/browser/media/fake_desktop_media_list.h" 15 #include "chrome/browser/media/webrtc/fake_desktop_media_list.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
17 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
20 #include "content/public/test/browser_test_utils.h" 20 #include "content/public/test/browser_test_utils.h"
21 #include "extensions/common/switches.h" 21 #include "extensions/common/switches.h"
22 #include "net/dns/mock_host_resolver.h" 22 #include "net/dns/mock_host_resolver.h"
23 #include "net/test/embedded_test_server/embedded_test_server.h" 23 #include "net/test/embedded_test_server/embedded_test_server.h"
24 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h" 24 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h"
25 25
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 EXPECT_TRUE(result); 280 EXPECT_TRUE(result);
281 EXPECT_TRUE(test_flags[2].picker_created); 281 EXPECT_TRUE(test_flags[2].picker_created);
282 EXPECT_FALSE(test_flags[2].picker_deleted); 282 EXPECT_FALSE(test_flags[2].picker_deleted);
283 283
284 web_contents->Close(); 284 web_contents->Close();
285 destroyed_watcher.Wait(); 285 destroyed_watcher.Wait();
286 EXPECT_TRUE(test_flags[2].picker_deleted); 286 EXPECT_TRUE(test_flags[2].picker_deleted);
287 } 287 }
288 288
289 } // namespace extensions 289 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698