Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure().

chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
index d3c8ad4c0f89447488296870c0d90755f1c163b9..83534f8eee23f246fb8f32a552f68ac927a0fd94 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/tabs.h"
+#include "chrome/common/origin_util.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -107,12 +108,13 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunAsync() {
 
     if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kAllowHttpScreenCapture) &&
-        !origin_.SchemeIsSecure()) {
+        !IsOriginSecure(origin_)) {
       error_ = kTabUrlNotSecure;
       return false;
     }
-    target_name = base::UTF8ToUTF16(origin_.SchemeIsSecure() ?
-        net::GetHostAndOptionalPort(origin_) : origin_.spec());
+    target_name = base::UTF8ToUTF16(IsOriginSecure(origin_)
+                                        ? net::GetHostAndOptionalPort(origin_)
+                                        : origin_.spec());
 
     if (!params->target_tab->id) {
       error_ = kNoTabIdError;