Track original URL when downloading a redirected page

components/offline_pages/core/background/save_page_request_unittest.cc

Index: components/offline_pages/core/background/save_page_request_unittest.cc
diff --git a/components/offline_pages/core/background/save_page_request_unittest.cc b/components/offline_pages/core/background/save_page_request_unittest.cc
index 7fc2dcd6f2ae6cba95f35fbc9229f05014186c54..ddfc2b990b776c47af291805933af2402e072513 100644
--- a/components/offline_pages/core/background/save_page_request_unittest.cc
+++ b/components/offline_pages/core/background/save_page_request_unittest.cc
@@ -11,6 +11,7 @@ namespace offline_pages {
 namespace {
 const int64_t kRequestId = 42;
 const GURL kUrl("http://example.com");
+const GURL kUrl2("http://example.com/test");
 const ClientId kClientId("bookmark", "1234");
 const bool kUserRequested = true;
 }  // namespace
@@ -26,16 +27,18 @@ TEST_F(SavePageRequestTest, CreatePendingReqeust) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kUrl, kClientId, creation_time,
                           kUserRequested);
-  ASSERT_EQ(kRequestId, request.request_id());
-  ASSERT_EQ(kUrl, request.url());
-  ASSERT_EQ(kClientId, request.client_id());
-  ASSERT_EQ(creation_time, request.creation_time());
-  ASSERT_EQ(creation_time, request.activation_time());
-  ASSERT_EQ(base::Time(), request.last_attempt_time());
-  ASSERT_EQ(0, request.completed_attempt_count());
-  ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE, request.request_state());
-  ASSERT_EQ(0, request.started_attempt_count());
-  ASSERT_EQ(0, request.completed_attempt_count());
+  request.set_original_url(kUrl2);
+  EXPECT_EQ(kRequestId, request.request_id());
+  EXPECT_EQ(kUrl, request.url());
+  EXPECT_EQ(kClientId, request.client_id());
+  EXPECT_EQ(creation_time, request.creation_time());
+  EXPECT_EQ(creation_time, request.activation_time());
+  EXPECT_EQ(base::Time(), request.last_attempt_time());
+  EXPECT_EQ(0, request.completed_attempt_count());
+  EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, request.request_state());
+  EXPECT_EQ(0, request.started_attempt_count());
+  EXPECT_EQ(0, request.completed_attempt_count());
+  EXPECT_EQ(kUrl2, request.original_url());
 }
 
 TEST_F(SavePageRequestTest, StartAndCompleteRequest) {
@@ -48,29 +51,29 @@ TEST_F(SavePageRequestTest, StartAndCompleteRequest) {
   request.MarkAttemptStarted(start_time);
 
   // Most things don't change about the request.
-  ASSERT_EQ(kRequestId, request.request_id());
-  ASSERT_EQ(kUrl, request.url());
-  ASSERT_EQ(kClientId, request.client_id());
-  ASSERT_EQ(creation_time, request.creation_time());
-  ASSERT_EQ(activation_time, request.activation_time());
+  EXPECT_EQ(kRequestId, request.request_id());
+  EXPECT_EQ(kUrl, request.url());
+  EXPECT_EQ(kClientId, request.client_id());
+  EXPECT_EQ(creation_time, request.creation_time());
+  EXPECT_EQ(activation_time, request.activation_time());
 
   // Attempt time, attempt count and status will though.
-  ASSERT_EQ(start_time, request.last_attempt_time());
-  ASSERT_EQ(1, request.started_attempt_count());
-  ASSERT_EQ(SavePageRequest::RequestState::OFFLINING, request.request_state());
+  EXPECT_EQ(start_time, request.last_attempt_time());
+  EXPECT_EQ(1, request.started_attempt_count());
+  EXPECT_EQ(SavePageRequest::RequestState::OFFLINING, request.request_state());
 
   request.MarkAttemptCompleted();
 
   // Again, most things don't change about the request.
-  ASSERT_EQ(kRequestId, request.request_id());
-  ASSERT_EQ(kUrl, request.url());
-  ASSERT_EQ(kClientId, request.client_id());
-  ASSERT_EQ(creation_time, request.creation_time());
-  ASSERT_EQ(activation_time, request.activation_time());
+  EXPECT_EQ(kRequestId, request.request_id());
+  EXPECT_EQ(kUrl, request.url());
+  EXPECT_EQ(kClientId, request.client_id());
+  EXPECT_EQ(creation_time, request.creation_time());
+  EXPECT_EQ(activation_time, request.activation_time());
 
   // Last attempt time and status are updated.
-  ASSERT_EQ(1, request.completed_attempt_count());
-  ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE, request.request_state());
+  EXPECT_EQ(1, request.completed_attempt_count());
+  EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, request.request_state());
 }
 
 TEST_F(SavePageRequestTest, StartAndAbortRequest) {
@@ -82,27 +85,27 @@ TEST_F(SavePageRequestTest, StartAndAbortRequest) {
   request.MarkAttemptStarted(start_time);
 
   // Most things don't change about the request.
-  ASSERT_EQ(kRequestId, request.request_id());
-  ASSERT_EQ(kUrl, request.url());
-  ASSERT_EQ(kClientId, request.client_id());
-  ASSERT_EQ(creation_time, request.creation_time());
+  EXPECT_EQ(kRequestId, request.request_id());
+  EXPECT_EQ(kUrl, request.url());
+  EXPECT_EQ(kClientId, request.client_id());
+  EXPECT_EQ(creation_time, request.creation_time());
 
   // Attempt time and attempt count will though.
-  ASSERT_EQ(start_time, request.last_attempt_time());
-  ASSERT_EQ(1, request.started_attempt_count());
-  ASSERT_EQ(SavePageRequest::RequestState::OFFLINING, request.request_state());
+  EXPECT_EQ(start_time, request.last_attempt_time());
+  EXPECT_EQ(1, request.started_attempt_count());
+  EXPECT_EQ(SavePageRequest::RequestState::OFFLINING, request.request_state());
 
   request.MarkAttemptAborted();
 
   // Again, most things don't change about the request.
-  ASSERT_EQ(kRequestId, request.request_id());
-  ASSERT_EQ(kUrl, request.url());
-  ASSERT_EQ(kClientId, request.client_id());
-  ASSERT_EQ(creation_time, request.creation_time());
+  EXPECT_EQ(kRequestId, request.request_id());
+  EXPECT_EQ(kUrl, request.url());
+  EXPECT_EQ(kClientId, request.client_id());
+  EXPECT_EQ(creation_time, request.creation_time());
 
   // Last attempt time is updated and completed attempt count did not rise.
-  ASSERT_EQ(0, request.completed_attempt_count());
-  ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE, request.request_state());
+  EXPECT_EQ(0, request.completed_attempt_count());
+  EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, request.request_state());
 }
 
 }  // namespace offline_pages