Switch //chrome/browser code to use IsOriginSecure() instead of SchemeIsSecure().

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

 // Copyright 2013 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/extensions/api/desktop_capture/desktop_capture_api.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/origin_util.h"
 #include "net/base/net_util.h"
 
 namespace extensions {
 
 namespace {
 
 const char kNoTabIdError[] = "targetTab doesn't have id field set.";
 const char kNoUrlError[] = "targetTab doesn't have URL field set.";
 const char kInvalidOriginError[] = "targetTab.url is not a valid URL.";
 const char kInvalidTabIdError[] = "Invalid tab specified.";
@@ skipping 34 matching lines @@
     }
     origin = GURL(*(params->target_tab->url)).GetOrigin();
 
     if (!origin.is_valid()) {
       error_ = kInvalidOriginError;
       return false;
     }
 
     if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kAllowHttpScreenCapture) &&
-        !origin.SchemeIsSecure()) {
+        !content::IsOriginSecure(origin)) {
       error_ = kTabUrlNotSecure;
       return false;
     }
-    target_name = base::UTF8ToUTF16(origin.SchemeIsSecure() ?
+    target_name = base::UTF8ToUTF16(content::IsOriginSecure(origin) ?
         net::GetHostAndOptionalPort(origin) : origin.spec());
 
     if (!params->target_tab->id) {
       error_ = kNoTabIdError;
       return false;
     }
 
     if (!ExtensionTabUtil::GetTabById(*(params->target_tab->id), GetProfile(),
                                       true, NULL, NULL, &web_contents, NULL)) {
       error_ = kInvalidTabIdError;
@@ skipping 10 matching lines @@
   return Execute(params->sources, web_contents, origin, target_name);
 }
 
 DesktopCaptureCancelChooseDesktopMediaFunction::
     DesktopCaptureCancelChooseDesktopMediaFunction() {}
 
 DesktopCaptureCancelChooseDesktopMediaFunction::
     ~DesktopCaptureCancelChooseDesktopMediaFunction() {}
 
 }  // namespace extensions