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

chrome/browser/external_protocol/external_protocol_handler.h

Index: chrome/browser/external_protocol/external_protocol_handler.h
diff --git a/chrome/browser/external_protocol/external_protocol_handler.h b/chrome/browser/external_protocol/external_protocol_handler.h
index 99c0f0384b6acd059c5e9e22e8234277c4f0c0f8..e70e79bbb9471d3749dc9bd68bca1fcfebd57d13 100644
--- a/chrome/browser/external_protocol/external_protocol_handler.h
+++ b/chrome/browser/external_protocol/external_protocol_handler.h
@@ -14,6 +14,7 @@
 
 class GURL;
 class PrefRegistrySimple;
+class Profile;
 
 namespace base {
 class DictionaryValue;
@@ -34,7 +35,8 @@ class ExternalProtocolHandler {
     CreateShellWorker(
         const shell_integration::DefaultWebClientWorkerCallback& callback,
         const std::string& protocol) = 0;
-    virtual BlockState GetBlockState(const std::string& scheme) = 0;
+    virtual BlockState GetBlockState(const std::string& scheme,
+                                     Profile* profile) = 0;
     virtual void BlockRequest() = 0;
     virtual void RunExternalProtocolDialog(
         const GURL& url,
@@ -50,10 +52,12 @@ class ExternalProtocolHandler {
   };
 
   // Returns whether we should block a given scheme.
-  static BlockState GetBlockState(const std::string& scheme);
+  static BlockState GetBlockState(const std::string& scheme, Profile* profile);
 
   // Sets whether we should block a given scheme.
-  static void SetBlockState(const std::string& scheme, BlockState state);
+  static void SetBlockState(const std::string& scheme,
+                            BlockState state,
+                            Profile* profile);
 
   // Checks to see if the protocol is allowed, if it is whitelisted,
   // the application associated with the protocol is launched on the io thread,