Revert of Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure().

chrome/browser/media/media_stream_device_permissions.cc

 // Copyright 2014 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/browser/media/media_stream_device_permissions.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/common/origin_util.h"
 #include "extensions/common/constants.h"
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "components/user_manager/user_manager.h"
 #endif
 
 namespace {
 
 bool IsInKioskMode() {
@@ skipping 21 matching lines @@
   // It's safe to persist block settings all the time.
   if (setting == CONTENT_SETTING_BLOCK)
     return true;
 
   // Pepper requests should always be persisted to prevent annoying users of
   // plugins.
   if (type == content::MEDIA_OPEN_DEVICE)
     return true;
 
   // We persist requests from secure origins.
-  if (content::IsOriginSecure(origin))
+  if (origin.SchemeIsSecure())
+    return true;
+
+  // We persist requests from extensions.
+  if (origin.SchemeIs(extensions::kExtensionScheme))
     return true;
 
   return false;
 }
 
 bool CheckAllowAllMediaStreamContentForOrigin(Profile* profile,
                                               const GURL& security_origin,
                                               ContentSettingsType type) {
   DCHECK(type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
          type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
@@ skipping 35 matching lines @@
 
   // If a match was not found, check if audio capture is otherwise disallowed
   // or if the user should be prompted.  Setting the policy value to "true"
   // is equal to not setting it at all, so from hereon out, we will return
   // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access).
   if (!prefs->GetBoolean(policy_name))
     return ALWAYS_DENY;
 
   return POLICY_NOT_SET;
 }