Pass in extra parameters to WebApkBuilder#buildWebApkAsync()

content/browser/manifest/manifest_manager_host.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 "content/browser/manifest/manifest_manager_host.h"
 
 #include <stdint.h>
 
 #include "base/stl_util.h"
 #include "content/common/manifest_manager_messages.h"
@@ skipping 47 matching lines @@
   {
     GetCallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
     if (!callbacks)
       return;
 
     // Call the callbacks with a failure state before deleting them. Do this in
     // a block so the iterator is destroyed before |callbacks|.
     {
       GetCallbackMap::const_iterator it(callbacks);
       for (; !it.IsAtEnd(); it.Advance())
-        it.GetCurrentValue()->Run(Manifest());
+        it.GetCurrentValue()->Run(GURL(), Manifest());
     }
 
     delete callbacks;
     pending_get_callbacks_.erase(render_frame_host);
   }
 
   {
     HasCallbackMap* callbacks = HasCallbackMapForFrame(render_frame_host);
     if (!callbacks)
       return;
@@ skipping 51 matching lines @@
                         OnHasManifestResponse)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void ManifestManagerHost::OnRequestManifestResponse(
     RenderFrameHost* render_frame_host,
     int request_id,
+    const GURL& manifest_url,
     const Manifest& insecure_manifest) {
   GetCallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
   if (!callbacks) {
     DVLOG(1) << "Unexpected RequestManifestResponse to from renderer. "
                 "Killing renderer.";
     KillRenderer(render_frame_host);
     return;
   }
 
   GetManifestCallback* callback = callbacks->Lookup(request_id);
@@ skipping 37 matching lines @@
   // theme_color and background_color are 32 bit unsigned integers with 64 bit
   // integers simply being used to encode the occurence of an error. Therefore,
   // any value outside the range of a 32 bit integer is invalid.
   if (manifest.theme_color < std::numeric_limits<int32_t>::min() ||
       manifest.theme_color > std::numeric_limits<int32_t>::max())
     manifest.theme_color = Manifest::kInvalidOrMissingColor;
   if (manifest.background_color < std::numeric_limits<int32_t>::min() ||
       manifest.background_color > std::numeric_limits<int32_t>::max())
     manifest.background_color = Manifest::kInvalidOrMissingColor;
 
-  callback->Run(manifest);
+  callback->Run(manifest_url, manifest);
   callbacks->Remove(request_id);
   if (callbacks->IsEmpty()) {
     delete callbacks;
     pending_get_callbacks_.erase(render_frame_host);
   }
 }
 
 void ManifestManagerHost::OnHasManifestResponse(
     RenderFrameHost* render_frame_host,
     int request_id,
@@ skipping 16 matching lines @@
 
   callback->Run(has_manifest);
   callbacks->Remove(request_id);
   if (callbacks->IsEmpty()) {
     delete callbacks;
     pending_has_callbacks_.erase(render_frame_host);
   }
 }
 
 } // namespace content