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

chrome/browser/ui/external_protocol_dialog_delegate.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/external_protocol_dialog_delegate.h"
 
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/text_elider.h"
 
 namespace {
 
 const size_t kMaxCommandSize = 32;
@@ skipping 36 matching lines @@
                                     ElideCommandName(program_name_));
 }
 
 base::string16 ExternalProtocolDialogDelegate::GetTitleText() const {
   return l10n_util::GetStringFUTF16(IDS_EXTERNAL_PROTOCOL_TITLE,
                                     ElideCommandName(program_name_));
 }
 
 void ExternalProtocolDialogDelegate::DoAccept(const GURL& url,
                                               bool dont_block) const {
-  if (dont_block) {
-    ExternalProtocolHandler::SetBlockState(url.scheme(),
-                                           ExternalProtocolHandler::DONT_BLOCK);
-  }
-
   content::WebContents* web_contents = tab_util::GetWebContentsByID(
       render_process_host_id_, render_view_routing_id_);
 
+  if (dont_block) {
+    Profile* profile =
+        Profile::FromBrowserContext(web_contents->GetBrowserContext());
+
+    ExternalProtocolHandler::SetBlockState(
+        url.scheme(), ExternalProtocolHandler::DONT_BLOCK, profile);
+  }
+
   ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(url, web_contents);
 }
 
 void ExternalProtocolDialogDelegate::DoCancel(const GURL& url,
                                               bool dont_block) const {
   if (dont_block) {
-    ExternalProtocolHandler::SetBlockState(url.scheme(),
-                                           ExternalProtocolHandler::BLOCK);
+    content::WebContents* web_contents = tab_util::GetWebContentsByID(
+        render_process_host_id_, render_view_routing_id_);
+    Profile* profile =
+        Profile::FromBrowserContext(web_contents->GetBrowserContext());
+
+    ExternalProtocolHandler::SetBlockState(
+        url.scheme(), ExternalProtocolHandler::BLOCK, profile);
   }
 }