[Re-landing] Migrate external protocol prefs from local state to profiles

chrome/browser/ui/cocoa/external_protocol_dialog.mm

Index: chrome/browser/ui/cocoa/external_protocol_dialog.mm
diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog.mm b/chrome/browser/ui/cocoa/external_protocol_dialog.mm
index 73781e0fd61e046eb0e25fbd60b2d7498d690f44..251f1aa19f48c147aebac3f114b1813decb74964 100644
--- a/chrome/browser/ui/cocoa/external_protocol_dialog.mm
+++ b/chrome/browser/ui/cocoa/external_protocol_dialog.mm
@@ -7,6 +7,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/grit/chromium_strings.h"
@@ -106,9 +107,15 @@ void ExternalProtocolHandler::RunExternalProtocolDialog(
       NOTREACHED();
   }
 
+  content::WebContents* web_contents =
+        tab_util::GetWebContentsByID(render_process_host_id_, routing_id_);
+
   // Set the "don't warn me again" info.
   if ([[alert_ suppressionButton] state] == NSOnState) {
-    ExternalProtocolHandler::SetBlockState(url_.scheme(), blockState);
+    Profile* profile =
+        Profile::FromBrowserContext(web_contents->GetBrowserContext());
+
+    ExternalProtocolHandler::SetBlockState(url_.scheme(), blockState, profile);
     ExternalProtocolHandler::RecordMetrics(true);
   } else {
     ExternalProtocolHandler::RecordMetrics(false);
@@ -118,9 +125,6 @@ void ExternalProtocolHandler::RunExternalProtocolDialog(
     UMA_HISTOGRAM_LONG_TIMES("clickjacking.launch_url",
                              base::Time::Now() - creation_time_);
 
-    content::WebContents* web_contents =
-        tab_util::GetWebContentsByID(render_process_host_id_, routing_id_);
-
     ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(url_, web_contents);
   }