Use a monotonic clock (TimeTicks) to report network times to WebCore.

chrome/common/extensions/extension_localization_peer_unittest.cc

Index: chrome/common/extensions/extension_localization_peer_unittest.cc
diff --git a/chrome/common/extensions/extension_localization_peer_unittest.cc b/chrome/common/extensions/extension_localization_peer_unittest.cc
index df847ce2e620000e9d07d2769aabebe147e75aeb..45d8b57bf535d97f11b9f3f09191b9e077d7f9a2 100644
--- a/chrome/common/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/common/extensions/extension_localization_peer_unittest.cc
@@ -58,13 +58,17 @@ class MockResourceLoaderBridgePeer
   virtual ~MockResourceLoaderBridgePeer() {}
 
   MOCK_METHOD2(OnUploadProgress, void(uint64 position, uint64 size));
-  MOCK_METHOD4(OnReceivedRedirect, bool(
+  MOCK_METHOD6(OnReceivedRedirect, bool(
       const GURL& new_url,
       const webkit_glue::ResourceResponseInfo& info,
+      const base::TimeTicks& start_time,
+      const base::TimeTicks& end_time,
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies));
-  MOCK_METHOD1(OnReceivedResponse, void(
-      const webkit_glue::ResourceResponseInfo& info));
+  MOCK_METHOD3(OnReceivedResponse, void(
+      const webkit_glue::ResourceResponseInfo& info,
+      const base::TimeTicks& start_time,
+      const base::TimeTicks& end_time));
   MOCK_METHOD1(OnDownloadedData, void(int len));
   MOCK_METHOD3(OnReceivedData, void(const char* data,
                                     int data_length,
@@ -72,7 +76,7 @@ class MockResourceLoaderBridgePeer
   MOCK_METHOD3(OnCompletedRequest, void(
       const net::URLRequestStatus& status,
       const std::string& security_info,
-      const base::Time& completion_time));
+      const base::TimeTicks& completion_time));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockResourceLoaderBridgePeer);
@@ -140,13 +144,13 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer = filter_peer_.release();
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, _, _));

[jar (doing other things), 2011/10/12 01:07:38]

I don't believe that underscore is a good variable name.  Please switch to
meaningful names.

Are these macros?  What is going on here?

If this is some new naming convention in the test system, then please cite the
reference so I can read about it.

[James Simonsen, 2011/10/12 02:57:46]

http://code.google.com/p/googlemock/ (or go/gmock internally)

_ is a wildcard matcher. It will match any argument passed in to that function.

   EXPECT_CALL(*original_peer_, OnCompletedRequest(
-    IsURLRequestEqual(net::URLRequestStatus::CANCELED), "", base::Time()));
+    IsURLRequestEqual(net::URLRequestStatus::CANCELED), "", base::TimeTicks()));
 
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::FAILED);
-  filter_peer->OnCompletedRequest(status, "", base::Time());
+  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
@@ -156,13 +160,13 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
   EXPECT_CALL(*original_peer_, OnReceivedData(_, _, _)).Times(0);
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
-  EXPECT_CALL(*original_peer_, OnCompletedRequest(
-      IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time()));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, _, _));
+  EXPECT_CALL(*original_peer_, OnCompletedRequest(IsURLRequestEqual(
+      net::URLRequestStatus::SUCCESS), "", base::TimeTicks()));
 
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::Time());
+  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
@@ -177,21 +181,21 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(data.data()), data.length(), -1)).Times(2);
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_)).Times(2);
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, _, _)).Times(2);
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
       IsURLRequestEqual(
-          net::URLRequestStatus::SUCCESS), "", base::Time())).Times(2);
+          net::URLRequestStatus::SUCCESS), "", base::TimeTicks())).Times(2);
 
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::Time());
+  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 
   // Test if Send gets called again (it shouldn't be) when first call returned
   // an empty dictionary.
   filter_peer =
       CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
   SetData(filter_peer, "some text");
-  filter_peer->OnCompletedRequest(status, "", base::Time());
+  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
@@ -215,13 +219,13 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(data.data()), data.length(), -1));
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
-  EXPECT_CALL(*original_peer_, OnCompletedRequest(
-      IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time()));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, _, _));
+  EXPECT_CALL(*original_peer_, OnCompletedRequest(IsURLRequestEqual(
+      net::URLRequestStatus::SUCCESS), "", base::TimeTicks()));
 
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::Time());
+  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
@@ -245,11 +249,11 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(message.data()), message.length(), -1));
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
-  EXPECT_CALL(*original_peer_, OnCompletedRequest(
-      IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time()));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, _, _));
+  EXPECT_CALL(*original_peer_, OnCompletedRequest(IsURLRequestEqual(
+      net::URLRequestStatus::SUCCESS), "", base::TimeTicks()));
 
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::Time());
+  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }