Roll cacheinvalidation to @307 and add OWNERS file for the directory.

- Bump internal versioning datestamp for June 2013 release.
- Fix inlined virtual method ugliness.
- Update README.chromium.

Review URL: https://chromiumcodereview.appspot.com/16597002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204964 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 31 insertions, 7 deletions

diff --git a/third_party/cacheinvalidation/OWNERS b/third_party/cacheinvalidation/OWNERS
new file mode 100644
index 0000000..3b4e07b
--- /dev/null
+++ b/third_party/cacheinvalidation/OWNERS
@@ -0,0 +1,10 @@
+# Owners of third_party/cacheinvalidation
+#
+# These are current and former members of the Sync team who have the most
+# knowledge and experience with the cacheinvalidation library.
+
+akalin@chromium.org
+dcheng@chromium.org
+rlarocque@chromium.org
+tim@chromium.org
+zea@chromium.org
diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium
index 836451e..e466391 100644
--- a/third_party/cacheinvalidation/README.chromium
+++ b/third_party/cacheinvalidation/README.chromium
@@ -1,7 +1,7 @@
 Name: Google Cache Invalidation API
 Short Name: google-cache-invalidation-api
 URL: http://code.google.com/p/google-cache-invalidation-api/
-Version: r247
+Version: r307
 License: Apache 2.0
 License File: src/google/cacheinvalidation/COPYING
 Security Critical: no
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 1fcb28a..8566506 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -51,6 +51,7 @@
         'overrides/google/cacheinvalidation/deps/logging.h',
         'overrides/google/cacheinvalidation/deps/mutex.h',
         'overrides/google/cacheinvalidation/deps/random.h',
+        'overrides/google/cacheinvalidation/deps/random.cc',
         'overrides/google/cacheinvalidation/deps/sha1-digest-function.h',
         'overrides/google/cacheinvalidation/deps/scoped_ptr.h',
         'overrides/google/cacheinvalidation/deps/stl-namespace.h',
diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.cc b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.cc
new file mode 100644
index 0000000..808baa65
--- /dev/null
+++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.cc
@@ -0,0 +1,17 @@
+// Copyright 2013 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 "google/cacheinvalidation/deps/random.h"
+
+namespace invalidation {
+
+double Random::RandDouble() {
+  return base::RandDouble();
+}
+
+uint64 Random::RandUint64() {
+  return base::RandUint64();
+}
+
+}  // namespace invalidation
diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.h
index e1b0810..55b3abc 100644
--- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.h
+++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/random.h
@@ -17,13 +17,9 @@ class Random {
   virtual ~Random() {}
 
   // Returns a pseudorandom value between(inclusive) and(exclusive).
-  virtual double RandDouble() {
-    return base::RandDouble();
-  }
+  virtual double RandDouble();
 
-  virtual uint64 RandUint64() {
-    return base::RandUint64();
-  }
+  virtual uint64 RandUint64();
 };
 
 }  // namespace invalidation