Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7384)

Unified Diff: chrome/common/extensions/extension_localization_peer_unittest.cc

Issue 7602023: Use a monotonic clock (TimeTicks) to report network times to WebCore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..c44ba259a1a4cd53a3f131bada32c217f87b4d70 100644
--- a/chrome/common/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/common/extensions/extension_localization_peer_unittest.cc
@@ -72,7 +72,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);
@@ -142,11 +142,11 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {
EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
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) {
@@ -157,12 +157,12 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
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_, 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) {
@@ -180,18 +180,18 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
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) {
@@ -216,12 +216,12 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
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_, 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) {
@@ -246,10 +246,10 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
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_, 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());
}

Powered by Google App Engine
This is Rietveld 408576698