Change ChooserController ownership model

components/chooser_controller/chooser_controller.cc

 // Copyright 2016 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 "components/chooser_controller/chooser_controller.h"
 
 #include "content/public/browser/render_frame_host.h"
+#include "url/origin.h"
 
 ChooserController::ChooserController(content::RenderFrameHost* owner)
     : owning_frame_(owner) {}
 
 ChooserController::~ChooserController() {}
 
 url::Origin ChooserController::GetOrigin() const {
-  return const_cast<content::RenderFrameHost*>(owning_frame_)
-      ->GetLastCommittedOrigin();
+  if (!owning_frame_)
+    return url::Origin();
+  else {
+    return const_cast<content::RenderFrameHost*>(owning_frame_)
+        ->GetLastCommittedOrigin();
+  }

[Reilly Grant (use Gerrit), 2016/06/21 23:47:45]

Make owning_frame_ non-const to avoid this cast. This can then be written more
clearly as:

return owning_frame_ ? owning_frame_->GetLastCommittedOrigin() : url::Origin();

[juncai, 2016/06/22 01:17:45]

Done.

 }