8 files changed, 19 insertions, 5 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi
index 87c69f0..3030d43 100644
--- a/build/features_override.gypi
+++ b/build/features_override.gypi
@@ -28,6 +28,7 @@
       'ENABLE_JAVASCRIPT_I18N_API=1',
       'ENABLE_FILE_SYSTEM=1',
       'ENABLE_FILTERS=1',
+      'ENABLE_FULLSCREEN_API=1',
       'ENABLE_GEOLOCATION=1',
       'ENABLE_ICONDATABASE=0',
       'ENABLE_INDEXED_DATABASE=1',
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 7903747..76bde5a 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -305,6 +305,9 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
         !command_line.HasSwitch(switches::kNoPings);
     web_prefs.interactive_form_validation_enabled =
         !command_line.HasSwitch(switches::kDisableInteractiveFormValidation);
+    web_prefs.fullscreen_enabled =
+        command_line.HasSwitch(switches::kEnableFullScreen);
+
     // The user stylesheet watcher may not exist in a testing profile.
     if (profile->GetUserStyleSheetWatcher()) {
       web_prefs.user_style_sheet_enabled = true;
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index dc91d8d..2c427e0 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -492,6 +492,9 @@ const char kEnableFileCookies[]             = "enable-file-cookies";
 // Enable the use of the HistoryQuickProvider for autocomplete results.
 const char kEnableHistoryQuickProvider[]    = "enable-history-quick-provider";
 
+// Enable the JavaScript Full Screen API.
+const char kEnableFullScreen[]              = "enable-fullscreen";
+
 // Enable the in-browser thumbnailing, which is more efficient than the
 // in-renderer thumbnailing, as we can use more information to determine
 // if we need to update thumbnails.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index ab3175c..1cf6dda 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -146,6 +146,7 @@ extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
+extern const char kEnableFullScreen[];
 extern const char kEnableHistoryQuickProvider[];
 extern const char kEnableInBrowserThumbnailing[];
 extern const char kEnableIPv6[];
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index 8cdcf51..8a7f043 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -678,6 +678,7 @@ void ParamTraits<WebPreferences>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.accelerated_video_enabled);
   WriteParam(m, p.memory_info_enabled);
   WriteParam(m, p.interactive_form_validation_enabled);
+  WriteParam(m, p.fullscreen_enabled);
 }
 
 bool ParamTraits<WebPreferences>::Read(const Message* m, void** iter,
@@ -734,7 +735,8 @@ bool ParamTraits<WebPreferences>::Read(const Message* m, void** iter,
       ReadParam(m, iter, &p->accelerated_layers_enabled) &&
       ReadParam(m, iter, &p->accelerated_video_enabled) &&
       ReadParam(m, iter, &p->memory_info_enabled) &&
-      ReadParam(m, iter, &p->interactive_form_validation_enabled);
+      ReadParam(m, iter, &p->interactive_form_validation_enabled) &&
+      ReadParam(m, iter, &p->fullscreen_enabled);
 }
 
 void ParamTraits<WebPreferences>::Log(const param_type& p, std::string* l) {
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 252b83d..0edac2f 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -72,7 +72,8 @@ WebPreferences::WebPreferences()
       accelerated_2d_canvas_enabled(false),
       accelerated_plugins_enabled(false),
       memory_info_enabled(false),
-      interactive_form_validation_enabled(true) {
+      interactive_form_validation_enabled(true),
+      fullscreen_enabled(false) {
 }
 
 WebPreferences::~WebPreferences() {
@@ -205,4 +206,6 @@ void WebPreferences::Apply(WebView* web_view) const {
 
   settings->setInteractiveFormValidationEnabled(
       interactive_form_validation_enabled);
+
+  settings->setFullScreenEnabled(fullscreen_enabled);
 }
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 1b07b76..aed98ba 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -79,6 +79,7 @@ struct WebPreferences {
   bool accelerated_plugins_enabled;
   bool memory_info_enabled;
   bool interactive_form_validation_enabled;
+  bool fullscreen_enabled;
 
   // We try to keep the default values the same as the default values in
   // chrome, except for the cases where it would require lots of extra work for
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 3c9112b..7b36dde 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -10,9 +10,6 @@ BUGCR69594 SKIP : http/tests/appcache/different-https-origin-resource-main.html
 
 BUGV8_1203 DEBUG : fast/canvas/webgl/gl-get-calls.html = PASS CRASH
 
-// Potential broken test found by r75985.
-BUGCR74092 : http/tests/media/video-play-suspend.html = TIMEOUT
-
 // WebKit fix is at r79797, but since we had to revert the WebKit roll adding the failing expectation back.
 BUGJAMESR : fast/filesystem/op-get-entry.html = PASS TEXT
 
@@ -21,3 +18,6 @@ BUG_ANTONM MAC : http/tests/security/xss-DENIED-xml-external-entity.xhtml = TEXT
 BUG_ANTONM MAC : http/tests/security/xss-DENIED-xsl-external-entity.xml = TEXT
 
 BUG_TONYG MAC : svg/text/font-size-below-point-five.svg = TEXT
+
+// Skip these tests until the test_expecitations can be updated after this Chromium patch lands.
+BUGWK44797 SKIP : fullscreen = PASS FAIL TIMEOUT