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

chrome/browser/chrome_site_per_process_browsertest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 373 matching lines @@
                                  bool has_user_gesture) override {}
 
   scoped_refptr<shell_integration::DefaultProtocolClientWorker>
   CreateShellWorker(
       const shell_integration::DefaultWebClientWorkerCallback& callback,
       const std::string& protocol) override {
     return new shell_integration::DefaultProtocolClientWorker(callback,
                                                               protocol);
   }
 
-  ExternalProtocolHandler::BlockState GetBlockState(
-      const std::string& scheme) override {
+  ExternalProtocolHandler::BlockState GetBlockState(const std::string& scheme,
+                                                    Profile* profile) override {
     return ExternalProtocolHandler::DONT_BLOCK;
   }
 
   void BlockRequest() override {}
 
   void LaunchUrlWithoutSecurityCheck(
       const GURL& url,
       content::WebContents* web_contents) override {
     external_protocol_url_ = url;
     web_contents_ = web_contents;
@@ skipping 96 matching lines @@
       "document.querySelector('iframe').src = '" + frame_url.spec() + "';\n"
       "var w = window.open('about:blank');\n"
       "window.domAutomationController.send(!!w);\n",
       &popup_handle_is_valid));
   popup_observer.Wait();
 
   // The popup shouldn't be blocked.
   EXPECT_TRUE(popup_handle_is_valid);
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
 }