Index: chrome/browser/media/desktop_capture_access_handler.cc |
diff --git a/chrome/browser/media/desktop_capture_access_handler.cc b/chrome/browser/media/desktop_capture_access_handler.cc |
index d240678eddaccae7ebad74e009f7868eec2e6fdc..5ea5ee14b22c96958ee91b71210995f8a8510661 100644 |
--- a/chrome/browser/media/desktop_capture_access_handler.cc |
+++ b/chrome/browser/media/desktop_capture_access_handler.cc |
@@ -21,6 +21,7 @@ |
#include "content/public/browser/render_frame_host.h" |
#include "content/public/browser/render_process_host.h" |
#include "content/public/common/media_stream_request.h" |
+#include "content/public/common/origin_util.h" |
#include "extensions/browser/app_window/app_window.h" |
#include "extensions/browser/app_window/app_window_registry.h" |
#include "extensions/common/constants.h" |
@@ -76,8 +77,8 @@ base::string16 GetApplicationTitle(content::WebContents* web_contents, |
return base::UTF8ToUTF16(title); |
} |
GURL url = web_contents->GetURL(); |
- title = url.SchemeIsSecure() ? net::GetHostAndOptionalPort(url) |
- : url.GetOrigin().spec(); |
+ title = content::IsOriginSecure(url) ? net::GetHostAndOptionalPort(url) |
+ : url.GetOrigin().spec(); |
return base::UTF8ToUTF16(title); |
} |
@@ -178,8 +179,7 @@ void DesktopCaptureAccessHandler::ProcessScreenCaptureAccessRequest( |
IsBuiltInExtension(request.security_origin); |
const bool origin_is_secure = |
- request.security_origin.SchemeIsSecure() || |
- request.security_origin.SchemeIs(extensions::kExtensionScheme) || |
+ content::IsOriginSecure(request.security_origin) || |
base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kAllowHttpScreenCapture); |