Add a Node message in the malware details protocol buffer. This allows us to ...

chrome/browser/safe_browsing/malware_details.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_MALWARE_DETAILS_H_
 #define CHROME_BROWSER_SAFE_BROWSING_MALWARE_DETAILS_H_
 #pragma once
 
 // A class that encapsulates the detailed malware reports sent when
 // users opt-in to do so from the malware warning page.
@@ skipping 18 matching lines @@
   MalwareDetails(TabContents* tab_contents,
                  const SafeBrowsingService::UnsafeResource resource);
 
   // The SafeBrowsingService calls this from the IO thread, to get the
   // serialized report as a string and send it over.
   const std::string* GetSerializedReport();
 
  private:
   friend class base::RefCountedThreadSafe<MalwareDetails>;
 
+  // url -> Resource
   typedef base::hash_map<

[lzheng, 2011/01/12 22:30:15]

How about a little bit more verbose like "Map url to Resource."? Same below for
id -> Node?

[panayiotis, 2011/01/13 02:25:00]

Done.

     std::string,
     linked_ptr<safe_browsing::ClientMalwareReportRequest::Resource> >
   ResourceMap;
 
+  // id -> Node
+  typedef base::hash_map<
+    int,
+    linked_ptr<safe_browsing::ClientMalwareReportRequest::Node> >
+  NodeMap;
+
   // Starts the collection of the report.
   void StartCollection();
 
   // Whether the url is "public" so we can add it to the report.
   bool IsPublicUrl(const GURL& url) const;
 
-  // Adds a node to |urls_|. |parent| can be empty.
-  void AddNode(const std::string& url, const std::string& parent);
+  // Finds an existing Resource and Node for the given url, or creates a new one
+  // if not found, and adds them to |resources_| and |nodes_| respectively.
+  // Updates |resource| and |node|.
+  // Note: We create exactly one Node for each Resource.
+  void FindOrCreateResource(
+      const std::string& url,
+      safe_browsing::ClientMalwareReportRequest::Resource** resource,
+      safe_browsing::ClientMalwareReportRequest::Node** node);
+
+  // Adds a Resource and Node to resources_ and nodes_ with the given
+  // parent relationship. If a Node already exist, and |parent| is
+  // non-empty, it updates the Node's parent field.
+  void AddUrl(const std::string& url, const std::string& parent);
 
   ~MalwareDetails();
 
   TabContents* tab_contents_;
   const SafeBrowsingService::UnsafeResource resource_;
 
-  // The urls that we collect. We first add them into this map and then
-  // generate a protocol buffer from it.
-  ResourceMap urls_;
+  // For every Url we collect we create a Resource message. We keep
+  // them in a map so we can avoid duplicates. Currently a Resource is
+  // a (Url, id) pair.

[lzheng, 2011/01/12 22:30:15]

Resource also contains http response and http request, right?

[panayiotis, 2011/01/13 02:25:00]

Done.

+  ResourceMap resources_;
+
+  // Each Resource has a corresponding Node (keyed by the id) that
+  // knows the parent id of the resource.
+  NodeMap nodes_;
 
   // The report protocol buffer.
   scoped_ptr<safe_browsing::ClientMalwareReportRequest> report_;
 
   DISALLOW_COPY_AND_ASSIGN(MalwareDetails);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_MALWARE_DETAILS_H_