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/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/desktop_media_list_ash.h"
 #include "chrome/browser/media/desktop_streams_registry.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/native_desktop_media_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/tabs.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"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/origin_util.h"
 #include "net/base/net_util.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
 
 namespace extensions {
 
 namespace {
 
 const char kInvalidSourceNameError[] = "Invalid source type specified.";
@@ skipping 66 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()) {
+        !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_)

[felt, 2015/05/09 15:14:27]

did git cl format do this? the wrapping looks odd

[lgarron, 2015/05/12 01:53:08]

Yeah, this is the result of `git cl format`.
I don't find the wrapping especially odd, but now that you point it out, I like
the old one better. I've changed it back (starting at the "?" character).

+                                        : 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;
       return false;
@@ skipping 170 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions