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

Unified Diff: chrome/browser/memory/tab_manager_browsertest.cc

Issue 1630443002: [Merge M49] [TabManager] Protect tabs that are using camera/microphone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/memory/tab_manager.cc ('k') | chrome/browser/memory/tab_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/memory/tab_manager_browsertest.cc
diff --git a/chrome/browser/memory/tab_manager_browsertest.cc b/chrome/browser/memory/tab_manager_browsertest.cc
index a76e4e065bf862a9ae22eeb8f2b0439c99fdfea5..165d4f93ca7fe1038d746d8a6f68f33e44e9757d 100644
--- a/chrome/browser/memory/tab_manager_browsertest.cc
+++ b/chrome/browser/memory/tab_manager_browsertest.cc
@@ -8,6 +8,8 @@
#include "base/test/simple_test_tick_clock.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/media/media_capture_devices_dispatcher.h"
+#include "chrome/browser/media/media_stream_capture_indicator.h"
#include "chrome/browser/memory/tab_manager.h"
#include "chrome/browser/memory/tab_manager_web_contents_data.h"
#include "chrome/browser/ui/browser.h"
@@ -318,6 +320,42 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, ProtectRecentlyUsedTabs) {
EXPECT_TRUE(tab_manager->DiscardTab());
}
+// Makes sure that tabs using media devices are protected.
+IN_PROC_BROWSER_TEST_F(TabManagerTest, ProtectVideoTabs) {
+ TabManager* tab_manager = g_browser_process->GetTabManager();
+ ASSERT_TRUE(tab_manager);
+
+ // Open 2 tabs, the second one being in the background.
+ ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL));
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), GURL(chrome::kChromeUIAboutURL), NEW_BACKGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+
+ auto tab = browser()->tab_strip_model()->GetWebContentsAt(1);
+
+ // Simulate that a video stream is now being captured.
+ content::MediaStreamDevice fake_media_device(
+ content::MEDIA_DEVICE_VIDEO_CAPTURE, "fake_media_device",
+ "fake_media_device");
+ content::MediaStreamDevices video_devices(1, fake_media_device);
+ MediaCaptureDevicesDispatcher* dispatcher =
+ MediaCaptureDevicesDispatcher::GetInstance();
+ dispatcher->SetTestVideoCaptureDevices(video_devices);
+ scoped_ptr<content::MediaStreamUI> video_stream_ui =
+ dispatcher->GetMediaStreamCaptureIndicator()->RegisterMediaStream(
+ tab, video_devices);
+ video_stream_ui->OnStarted(base::Closure());
+
+ // Should not be able to discard a tab.
+ ASSERT_FALSE(tab_manager->DiscardTab());
+
+ // Remove the video stream.
+ video_stream_ui.reset();
+
+ // Should be able to discard the background tab now.
+ EXPECT_TRUE(tab_manager->DiscardTab());
+}
+
} // namespace memory
#endif // OS_WIN || OS_CHROMEOS
« no previous file with comments | « chrome/browser/memory/tab_manager.cc ('k') | chrome/browser/memory/tab_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698