Remove RenderFrameHost pointer from ChooserController.

chrome/browser/chooser_controller/chooser_controller.cc

Index: chrome/browser/chooser_controller/chooser_controller.cc
diff --git a/chrome/browser/chooser_controller/chooser_controller.cc b/chrome/browser/chooser_controller/chooser_controller.cc
index 44340322c027e82fb39bceaf2db6263e8deff5ca..711b62ca50b611f1fe231ff0bb6ff5f976b7e16b 100644
--- a/chrome/browser/chooser_controller/chooser_controller.cc
+++ b/chrome/browser/chooser_controller/chooser_controller.cc
@@ -14,24 +14,16 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "url/origin.h"
 
-ChooserController::ChooserController(content::RenderFrameHost* owner,
-                                     int title_string_id_origin,
-                                     int title_string_id_extension)
-    : owning_frame_(owner),
-      title_string_id_origin_(title_string_id_origin),
-      title_string_id_extension_(title_string_id_extension) {}
+namespace {
 
-ChooserController::~ChooserController() {}
-
-base::string16 ChooserController::GetTitle() const {
-  if (!owning_frame_)

[juncai, 2017/03/14 20:57:22]

This if condition is not checked in the new code, I think this will break the
test since the |render_frame_host| is nullptr at:
https://codereview.chromium.org/2746313002/diff/20001/chrome/browser/chooser_...

[Reilly Grant (use Gerrit), 2017/03/14 21:21:01]

Fixed.

-    return base::string16();
-
-  url::Origin origin = owning_frame_->GetLastCommittedOrigin();
+base::string16 CreateTitle(content::RenderFrameHost* render_frame_host,
+                           int title_string_id_origin,
+                           int title_string_id_extension) {
+  url::Origin origin = render_frame_host->GetLastCommittedOrigin();
 
   if (origin.scheme() == extensions::kExtensionScheme) {
     content::WebContents* web_contents =
-        content::WebContents::FromRenderFrameHost(owning_frame_);
+        content::WebContents::FromRenderFrameHost(render_frame_host);
     content::BrowserContext* browser_context =
         web_contents->GetBrowserContext();
     extensions::ExtensionRegistry* extension_registry =
@@ -40,18 +32,33 @@ base::string16 ChooserController::GetTitle() const {
       const extensions::Extension* extension =
           extension_registry->enabled_extensions().GetByID(origin.host());
       if (extension) {
-        return l10n_util::GetStringFUTF16(title_string_id_extension_,
+        return l10n_util::GetStringFUTF16(title_string_id_extension,
                                           base::UTF8ToUTF16(extension->name()));
       }
     }
   }
 
   return l10n_util::GetStringFUTF16(
-      title_string_id_origin_,
+      title_string_id_origin,
       url_formatter::FormatOriginForSecurityDisplay(
           origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
 }
 
+}  // namespace
+
+ChooserController::ChooserController(content::RenderFrameHost* owner,
+                                     int title_string_id_origin,
+                                     int title_string_id_extension)
+    : title_(CreateTitle(owner,
+                         title_string_id_origin,
+                         title_string_id_extension)) {}
+
+ChooserController::~ChooserController() {}
+
+base::string16 ChooserController::GetTitle() const {
+  return title_;
+}
+
 bool ChooserController::ShouldShowIconBeforeText() const {
   return false;
 }