1 files changed, 14 insertions, 22 deletions
diff --git a/chromium/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chromium/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
index 9a140c10ead..82a0c898096 100644
--- a/chromium/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
+++ b/chromium/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -19,8 +19,8 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/browser/event_router.h"
-#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
+#include "url/origin.h"
 
 using content::BrowserThread;
 using extensions::tab_capture::TabCaptureState;
@@ -57,18 +57,10 @@ class TabCaptureRegistry::LiveRequest : public content::WebContentsObserver {
   ~LiveRequest() override {}
 
   // Accessors.
-  const std::string& extension_id() const {
-    return extension_id_;
-  }
-  bool is_anonymous() const {
-    return is_anonymous_;
-  }
-  TabCaptureState capture_state() const {
-    return capture_state_;
-  }
-  bool is_verified() const {
-    return is_verified_;
-  }
+  const std::string& extension_id() const { return extension_id_; }
+  bool is_anonymous() const { return is_anonymous_; }
+  TabCaptureState capture_state() const { return capture_state_; }
+  bool is_verified() const { return is_verified_; }
 
   void SetIsVerified() {
     DCHECK(!is_verified_);
@@ -78,7 +70,7 @@ class TabCaptureRegistry::LiveRequest : public content::WebContentsObserver {
   bool WasTargettingRenderFrameID(int render_process_id,
                                   int render_frame_id) const {
     return render_process_id_ == render_process_id &&
-        render_frame_id_ == render_frame_id;
+           render_frame_id_ == render_frame_id;
   }
 
   void UpdateCaptureState(TabCaptureState next_capture_state) {
@@ -140,7 +132,7 @@ class TabCaptureRegistry::LiveRequest : public content::WebContentsObserver {
 };
 
 TabCaptureRegistry::TabCaptureRegistry(content::BrowserContext* context)
-    : browser_context_(context), extension_registry_observer_(this) {
+    : browser_context_(context) {
   MediaCaptureDevicesDispatcher::GetInstance()->AddObserver(this);
   extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
@@ -221,17 +213,17 @@ std::string TabCaptureRegistry::AddRequest(
   content::RenderFrameHost* const main_frame = caller_contents->GetMainFrame();
   if (main_frame) {
     device_id = content::DesktopStreamsRegistry::GetInstance()->RegisterStream(
-        main_frame->GetProcess()->GetID(), main_frame->GetRoutingID(), origin,
-        source, extension_name, content::kRegistryStreamTypeTab);
+        main_frame->GetProcess()->GetID(), main_frame->GetRoutingID(),
+        url::Origin::Create(origin), source, extension_name,
+        content::kRegistryStreamTypeTab);
   }
 
   return device_id;
 }
 
-bool TabCaptureRegistry::VerifyRequest(
-    int render_process_id,
-    int render_frame_id,
-    const std::string& extension_id) {
+bool TabCaptureRegistry::VerifyRequest(int render_process_id,
+                                       int render_frame_id,
+                                       const std::string& extension_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   LiveRequest* const request = FindRequest(render_process_id, render_frame_id);
@@ -262,7 +254,7 @@ void TabCaptureRegistry::OnRequestUpdate(
   LiveRequest* request =
       FindRequest(target_render_process_id, target_render_frame_id);
   if (!request) {
-      return;  // Stale or invalid request update.
+    return;  // Stale or invalid request update.
   }
 
   TabCaptureState next_state = tab_capture::TAB_CAPTURE_STATE_NONE;