Allow popups, mouselock, and https media-stream content by default.

chrome/test/webdriver/webdriver_session.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/webdriver/webdriver_session.h"
 
 #include <sstream>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 93 matching lines @@
   }
   logger_.set_min_log_level(capabilities_.log_levels[LogType::kDriver]);
 
   Automation::BrowserOptions browser_options;
   browser_options.command = capabilities_.command;
   browser_options.channel_id = capabilities_.channel;
   browser_options.detach_process = capabilities_.detach;
   browser_options.user_data_dir = capabilities_.profile;
   if (!capabilities_.no_website_testing_defaults) {
     browser_options.ignore_certificate_errors = true;
-    browser_options.disable_popup_blocking = true;
   }
   RunSessionTask(base::Bind(
       &Session::InitOnSessionThread,
       base::Unretained(this),
       browser_options,
       &build_no_,
       &error));
   if (!error)
     error = PostBrowserStartInit();
 
@@ skipping 1768 matching lines @@
     return error;
 
   // Disable checking for SSL certificate revocation.
   error = SetPreference(
       "ssl.rev_checking.enabled",
       false /* is_user_pref */,
       Value::CreateBooleanValue(false));
   if (error)
     return error;
 
-  // Allow certain content by default.
+  // Allow content by default.
+  // Media-stream cannot be enabled by default; we must specify
+  // particular host patterns and devices.
+  DictionaryValue* devices = new DictionaryValue();
+  devices->SetString("audio", "Default");
+  devices->SetString("video", "Default");
+  DictionaryValue* content_settings = new DictionaryValue();
+  content_settings->Set("media-stream", devices);
+  DictionaryValue* pattern_pairs = new DictionaryValue();
+  pattern_pairs->Set("https://*,*", content_settings);
+  error = SetPreference(
+      "profile.content_settings.pattern_pairs",
+      true /* is_user_pref */,
+      pattern_pairs);
+  if (error)
+    return error;
   const int kAllowContent = 1;
   DictionaryValue* default_content_settings = new DictionaryValue();
   default_content_settings->SetInteger("geolocation", kAllowContent);
+  default_content_settings->SetInteger("mouselock", kAllowContent);
   default_content_settings->SetInteger("notifications", kAllowContent);
+  default_content_settings->SetInteger("popups", kAllowContent);
   return SetPreference(
       "profile.default_content_settings",
       true /* is_user_pref */,
       default_content_settings);
 }
 
 Error* Session::SetPrefs() {
   DictionaryValue::key_iterator iter = capabilities_.prefs->begin_keys();
   for (; iter != capabilities_.prefs->end_keys(); ++iter) {
     Value* value;
     capabilities_.prefs->GetWithoutPathExpansion(*iter, &value);
     Error* error = SetPreference(*iter, true /* is_user_pref */,
                                  value->DeepCopy());
     if (error)
       return error;
   }
   iter = capabilities_.local_state->begin_keys();
   for (; iter != capabilities_.local_state->end_keys(); ++iter) {
     Value* value;
     capabilities_.local_state->GetWithoutPathExpansion(*iter, &value);
     Error* error = SetPreference(*iter, false /* is_user_pref */,
                                  value->DeepCopy());
     if (error)
       return error;
   }
   return NULL;
 }
 
 }  // namespace webdriver