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

Unified Diff: chrome/browser/extensions/web_view_browsertest.cc

Issue 11093080: <webview>: First stab at implementing media permission request for guests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Plugin can be destroyed before we get Weak Callback, fixed. Created 7 years, 10 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 | « no previous file | chrome/chrome_renderer.gypi » ('j') | chrome/renderer/extensions/dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/web_view_browsertest.cc
diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/extensions/web_view_browsertest.cc
index b3480af87a9f005b53800d5744ac56fbbff5fe26..630df20dc6cedfb8325547ea3d6032cd8f726d5e 100644
--- a/chrome/browser/extensions/web_view_browsertest.cc
+++ b/chrome/browser/extensions/web_view_browsertest.cc
@@ -10,8 +10,10 @@
#include "chrome/browser/prerender/prerender_link_manager_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/ui_test_utils.h"
#include "chrome/test/base/test_launcher_utils.h"
+#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/test/browser_test_utils.h"
@@ -31,6 +33,15 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
command_line, gfx::kGLImplementationOSMesaName)) <<
"kUseGL must not be set by test framework code!";
#endif
+ const testing::TestInfo* const test_info =
+ testing::UnitTest::GetInstance()->current_test_info();
+ bool requires_experimental =
+ !strcmp(test_info->name(), "MediaAccessAPIEmbedderHasPermission") ||
+ !strcmp(test_info->name(), "MediaAccessAPIEmbedderHasNoPermission");
+ if (requires_experimental) {
+ CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kEnableExperimentalExtensionApis);
+ }
}
virtual void SetUp() OVERRIDE {
@@ -702,3 +713,18 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, SpeechRecognition) {
title_watcher.AlsoWaitForTitle(error_title);
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
}
+
+IN_PROC_BROWSER_TEST_F(WebViewTest, MediaAccessAPIEmbedderHasPermission) {
+ ASSERT_TRUE(StartTestServer()); // For serving guest pages.
+ ASSERT_TRUE(RunPlatformAppTest(
+ "platform_apps/web_view/media_access/embedder_has_permission"))
+ << message_;
+}
+
+IN_PROC_BROWSER_TEST_F(WebViewTest, MediaAccessAPIEmbedderHasNoPermission) {
+ ASSERT_TRUE(StartTestServer()); // For serving guest pages.
+ ASSERT_TRUE(RunPlatformAppTest(
+ "platform_apps/web_view/media_access/embedder_has_no_permission"))
+ << message_;
+}
+
« no previous file with comments | « no previous file | chrome/chrome_renderer.gypi » ('j') | chrome/renderer/extensions/dispatcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698