Convert visitedlink to use mojo.

components/visitedlink/browser/visitedlink_master.h

Index: components/visitedlink/browser/visitedlink_master.h
diff --git a/components/visitedlink/browser/visitedlink_master.h b/components/visitedlink/browser/visitedlink_master.h
index f7f4ca56b164afd651e168c55a87895eab7a55d3..e206f194af01171c202bc61710a21dc015b998ff 100644
--- a/components/visitedlink/browser/visitedlink_master.h
+++ b/components/visitedlink/browser/visitedlink_master.h
@@ -18,11 +18,11 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "components/visitedlink/common/visitedlink_common.h"
+#include "mojo/public/cpp/system/buffer.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -58,7 +58,7 @@ class VisitedLinkMaster : public VisitedLinkCommon {
 
     // Called when link coloring database has been created or replaced. The
     // argument is the new table handle.
-    virtual void NewTable(base::SharedMemory*) = 0;
+    virtual void NewTable(mojo::SharedBufferHandle table) = 0;
 
     // Called when new link has been added. The argument is the fingerprint
     // (hash) of the link.
@@ -73,9 +73,12 @@ class VisitedLinkMaster : public VisitedLinkCommon {
     virtual void Reset(bool invalidate_hashes) = 0;
   };
 
+  // |listener| may be non-null to inject a listener for tests. If non-null a
+  // default Listener will be used.
   VisitedLinkMaster(content::BrowserContext* browser_context,
                     VisitedLinkDelegate* delegate,
-                    bool persist_to_disk);
+                    bool persist_to_disk,
+                    std::unique_ptr<Listener> listener = nullptr);

[dcheng, 2016/09/20 22:29:27]

Nit: I think it's slightly better to just have SetListenerForTest(). That way,
we minimize the amount of test-only code in the Chrome binary. It means we
needlessly allocate an object in a test, but if we immediately replace it, that
should be fine, right?

(Similar thoughts about the timer override in VisitedLinkUpdater)

[Sam McNally, 2016/09/21 02:38:14]

Done.

 
   // In unit test mode, we allow the caller to optionally specify the database
   // filename so that it can be run from a unit test. The directory where this
@@ -105,7 +108,9 @@ class VisitedLinkMaster : public VisitedLinkCommon {
   // object won't work.
   bool Init();
 
-  base::SharedMemory* shared_memory() { return shared_memory_; }
+  const mojo::SharedBufferHandle& shared_memory() {
+    return shared_memory_.get();
+  }
 
   // Adds a URL to the table.
   void AddURL(const GURL& url);
@@ -320,11 +325,10 @@ class VisitedLinkMaster : public VisitedLinkCommon {
   // Structure is filled with 0s and shared header with salt. The result of
   // allocation is saved into |shared_memory| and |hash_table| points to the
   // beginning of Fingerprint table in |shared_memory|.
-  static bool CreateApartURLTable(
-      int32_t num_entries,
-      const uint8_t salt[LINK_SALT_LENGTH],
-      std::unique_ptr<base::SharedMemory>* shared_memory,
-      VisitedLinkCommon::Fingerprint** hash_table);
+  static bool CreateApartURLTable(int32_t num_entries,
+                                  const uint8_t salt[LINK_SALT_LENGTH],
+                                  mojo::ScopedSharedBufferHandle* shared_memory,
+                                  mojo::ScopedSharedBufferMapping* hash_table);
 
   // A wrapper for CreateURLTable, this will allocate a new table, initialized
   // to empty. The caller is responsible for saving the shared memory pointer
@@ -390,6 +394,11 @@ class VisitedLinkMaster : public VisitedLinkCommon {
     return hash - 1;
   }
 
+  // Returns a pointer to the start of the hash table, given the mapping
+  // containing the hash table.
+  static Fingerprint* GetHashTableFromMapping(
+      const mojo::ScopedSharedBufferMapping& hash_table_mapping);
+
   // Reference to the browser context that this object belongs to
   // (it knows the path to where the data is stored)
   content::BrowserContext* browser_context_;
@@ -435,7 +444,12 @@ class VisitedLinkMaster : public VisitedLinkCommon {
   bool persist_to_disk_;
 
   // Shared memory consists of a SharedHeader followed by the table.
-  base::SharedMemory *shared_memory_;
+  mojo::ScopedSharedBufferHandle shared_memory_;
+
+  // A mapping of the table including the SharedHeader.
+  // GetHashTableFromMapping() can be used to obtain a pointer to the hash table
+  // contained in this mapping.
+  mojo::ScopedSharedBufferMapping hash_table_mapping_;
 
   // When we generate new tables, we increment the serial number of the
   // shared memory object.