Change ChooserController ownership model

components/chooser_controller/chooser_controller.cc

Index: components/chooser_controller/chooser_controller.cc
diff --git a/components/chooser_controller/chooser_controller.cc b/components/chooser_controller/chooser_controller.cc
index 1d2c3c70118abbef11d99fe3769bbe67e43e2c6c..d29acceea4a95a072cbea18ba28d5833b84242eb 100644
--- a/components/chooser_controller/chooser_controller.cc
+++ b/components/chooser_controller/chooser_controller.cc
@@ -5,6 +5,7 @@
 #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) {}
@@ -12,6 +13,10 @@ ChooserController::ChooserController(content::RenderFrameHost* 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.

 }