Roll src/testing/gtest and src/testing/gmock

Summary of changes available at:
https://chromium.googlesource.com/external/googlemock/+log/896ba0e..2976396
(svn 485:501)
https://chromium.googlesource.com/external/googletest/+log/4650552..8245545
(svn 692:700)

Also, update mock_download_manager to work with changes in gmock.

BUG=None

Review URL: https://codereview.chromium.org/731393002

Cr-Commit-Position: refs/heads/master@{#304658}

3 files changed, 4 insertions, 4 deletions

diff --git a/DEPS b/DEPS
index 26d4460..03a05cc 100644
--- a/DEPS
+++ b/DEPS
@@ -118,10 +118,10 @@ deps = {
    Var('chromium_git') + '/external/open-vcdiff.git' + '@' + '438f2a5be6d809bc21611a94cd37bfc8c28ceb33', # from svn revision 41
 
   'src/testing/gtest':
-   Var('chromium_git') + '/external/googletest.git' + '@' + '4650552ff637bb44ecf7784060091cbed3252211', # from svn revision 692
+   Var('chromium_git') + '/external/googletest.git' + '@' + '8245545b6dc9c4703e6496d1efd19e975ad2b038', # from svn revision 700
 
   'src/testing/gmock':
-   Var('chromium_git') + '/external/googlemock.git' + '@' + '896ba0e03f520fb9b6ed582bde2bd00847e3c3f2', # from svn revision 485
+   Var('chromium_git') + '/external/googlemock.git' + '@' + '29763965ab52f24565299976b936d1265cb6a271', # from svn revision 501
 
   'src/third_party/angle':
    Var('chromium_git') + '/angle/angle.git' + '@' +  Var('angle_revision'),
diff --git a/content/public/test/mock_download_manager.cc b/content/public/test/mock_download_manager.cc
index a5d7cf9..e81ca93 100644
--- a/content/public/test/mock_download_manager.cc
+++ b/content/public/test/mock_download_manager.cc
@@ -64,7 +64,7 @@ MockDownloadManager::CreateDownloadItemAdapter::CreateDownloadItemAdapter(
 MockDownloadManager::CreateDownloadItemAdapter::~CreateDownloadItemAdapter() {}
 
 bool MockDownloadManager::CreateDownloadItemAdapter::operator==(
-    const CreateDownloadItemAdapter& rhs) {
+    const CreateDownloadItemAdapter& rhs) const {
   return (id == rhs.id &&
           current_path == rhs.current_path &&
           target_path == rhs.target_path &&
diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h
index 3334290..42275cb 100644
--- a/content/public/test/mock_download_manager.h
+++ b/content/public/test/mock_download_manager.h
@@ -67,7 +67,7 @@ class MockDownloadManager : public DownloadManager {
     CreateDownloadItemAdapter(const CreateDownloadItemAdapter& rhs);
     ~CreateDownloadItemAdapter();
 
-    bool operator==(const CreateDownloadItemAdapter& rhs);
+    bool operator==(const CreateDownloadItemAdapter& rhs) const;
   };
 
   MockDownloadManager();