Add support for icons.{src,type,density} in Manifest.

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 "content/common/manifest_manager_messages.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/manifest.h"
@@ skipping 91 matching lines @@
 
   // When receiving a Manifest, the browser process can't trust that it is
   // coming from a known and secure source. It must be processed accordingly.
   Manifest manifest = insecure_manifest;
   manifest.name = base::NullableString16(
       manifest.name.string().substr(0, Manifest::kMaxIPCStringLength),
       manifest.name.is_null());
   manifest.short_name = base::NullableString16(
         manifest.short_name.string().substr(0, Manifest::kMaxIPCStringLength),
         manifest.short_name.is_null());
-  if (!manifest.start_url.is_empty() && !manifest.start_url.is_valid())
+  if (!manifest.start_url.is_valid())
     manifest.start_url = GURL();
+  for (size_t i = 0; i < manifest.icons.size(); ++i) {
+    if (!manifest.icons[i].src.is_valid())
+      manifest.icons[i].src = GURL();
+    manifest.icons[i].type = base::NullableString16(
+        manifest.icons[i].type.string().substr(0,
+                                               Manifest::kMaxIPCStringLength),
+        manifest.icons[i].type.is_null());
+  }
 
   callback->Run(manifest);
   callbacks->Remove(request_id);
   if (callbacks->IsEmpty()) {
     delete callbacks;
     pending_callbacks_.erase(render_frame_host);
   }
 }
 
 } // namespace content