[Extensions] Clean up the handling of ExtensionHostMsg_Request

chrome/browser/extensions/extension_function_test_utils.cc

 // Copyright (c) 2012 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/extensions/extension_function_test_utils.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
@@ skipping 158 matching lines @@
       << "Could not parse extension function arguments: " << args;
   return RunFunction(function, parsed_args.Pass(), browser, flags);
 }
 
 bool RunFunction(UIThreadExtensionFunction* function,
                  scoped_ptr<base::ListValue> args,
                  Browser* browser,
                  RunFunctionFlags flags) {
   TestFunctionDispatcherDelegate dispatcher_delegate(browser);
   scoped_ptr<extensions::ExtensionFunctionDispatcher> dispatcher(
-      new extensions::ExtensionFunctionDispatcher(browser->profile(),
-                                                  &dispatcher_delegate));
+      new extensions::ExtensionFunctionDispatcher(browser->profile()));
+  dispatcher->set_delegate(&dispatcher_delegate);
   // TODO(yoz): The cast is a hack; these flags should be defined in
   // only one place.  See crbug.com/394840.
   return extensions::api_test_utils::RunFunction(
       function,
       args.Pass(),
       browser->profile(),
       dispatcher.Pass(),
       static_cast<extensions::api_test_utils::RunFunctionFlags>(flags));
 }
 
 } // namespace extension_function_test_utils