Update monet.

net/disk_cache/simple/simple_index_file.h

Index: net/disk_cache/simple/simple_index_file.h
diff --git a/net/disk_cache/simple/simple_index_file.h b/net/disk_cache/simple/simple_index_file.h
index 91f2a48f3686ec15dc80ff008cd8dd493b84d8d8..6adac5b3f23ea2e99d0381f1304c5bf13b633378 100644
--- a/net/disk_cache/simple/simple_index_file.h
+++ b/net/disk_cache/simple/simple_index_file.h
@@ -5,6 +5,8 @@
 #ifndef NET_DISK_CACHE_SIMPLE_SIMPLE_INDEX_FILE_H_
 #define NET_DISK_CACHE_SIMPLE_SIMPLE_INDEX_FILE_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
@@ -15,7 +17,6 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
-#include "base/port.h"
 #include "net/base/cache_type.h"
 #include "net/base/net_export.h"
 #include "net/disk_cache/simple/simple_index.h"
@@ -27,7 +28,7 @@ class TaskRunner;
 
 namespace disk_cache {
 
-const uint64 kSimpleIndexMagicNumber = GG_UINT64_C(0x656e74657220796f);
+const uint64 kSimpleIndexMagicNumber = UINT64_C(0x656e74657220796f);
 
 struct NET_EXPORT_PRIVATE SimpleIndexLoadResult {
   SimpleIndexLoadResult();
@@ -57,8 +58,8 @@ class NET_EXPORT_PRIVATE SimpleIndexFile {
     IndexMetadata();
     IndexMetadata(uint64 number_of_entries, uint64 cache_size);
 
-    void Serialize(Pickle* pickle) const;
-    bool Deserialize(PickleIterator* it);
+    void Serialize(base::Pickle* pickle) const;
+    bool Deserialize(base::PickleIterator* it);
 
     bool CheckIndexMetadata();
 
@@ -119,7 +120,7 @@ class NET_EXPORT_PRIVATE SimpleIndexFile {
   // data to be written to a file. Note: the pickle is not in a consistent state
   // immediately after calling this menthod, one needs to call
   // SerializeFinalData to make it ready to write to a file.
-  static scoped_ptr<Pickle> Serialize(
+  static scoped_ptr<base::Pickle> Serialize(
       const SimpleIndexFile::IndexMetadata& index_metadata,
       const SimpleIndex::EntrySet& entries);
 
@@ -127,7 +128,8 @@ class NET_EXPORT_PRIVATE SimpleIndexFile {
   // performed on a thread accessing the disk. It is not combined with the main
   // serialization path to avoid extra thread hops or copying the pickle to the
   // worker thread.
-  static bool SerializeFinalData(base::Time cache_modified, Pickle* pickle);
+  static bool SerializeFinalData(base::Time cache_modified,
+                                 base::Pickle* pickle);
 
   // Given the contents of an index file |data| of length |data_len|, returns
   // the corresponding EntrySet. Returns NULL on error.
@@ -149,7 +151,7 @@ class NET_EXPORT_PRIVATE SimpleIndexFile {
                               const base::FilePath& cache_directory,
                               const base::FilePath& index_filename,
                               const base::FilePath& temp_index_filename,
-                              scoped_ptr<Pickle> pickle,
+                              scoped_ptr<base::Pickle> pickle,
                               const base::TimeTicks& start_time,
                               bool app_on_background);
 
@@ -166,7 +168,7 @@ class NET_EXPORT_PRIVATE SimpleIndexFile {
   static bool LegacyIsIndexFileStale(base::Time cache_last_modified,
                                      const base::FilePath& index_file_path);
 
-  struct PickleHeader : public Pickle::Header {
+  struct PickleHeader : public base::Pickle::Header {
     uint32 crc;
   };