Link PasswordProtectionService to Profile and SB Service

components/safe_browsing/password_protection/password_protection_request.cc

 // Copyright 2017 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 "components/safe_browsing/password_protection/password_protection_request.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 66 matching lines @@
 void PasswordProtectionRequest::CheckCachedVerdicts() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!password_protection_service_) {
     Finish(RequestOutcome::SERVICE_DESTROYED, nullptr);
     return;
   }
 
   std::unique_ptr<LoginReputationClientResponse> cached_response =
       base::MakeUnique<LoginReputationClientResponse>();
   auto verdict = password_protection_service_->GetCachedVerdict(
-      password_protection_service_->GetSettingMapForActiveProfile(),
       main_frame_url_, cached_response.get());
   if (verdict != LoginReputationClientResponse::VERDICT_TYPE_UNSPECIFIED)
     Finish(RequestOutcome::RESPONSE_ALREADY_CACHED, std::move(cached_response));
   else
     SendRequest();
 }
 
+void PasswordProtectionRequest::FillRequestProto() {
+  request_proto_ = base::MakeUnique<LoginReputationClientRequest>();
+  request_proto_->set_page_url(main_frame_url_.spec());
+  request_proto_->set_trigger_type(request_type_);
+  request_proto_->set_stored_verdict_cnt(
+      password_protection_service_->GetStoredVerdictCount());
+  LoginReputationClientRequest::Frame* main_frame =
+      request_proto_->add_frames();
+  main_frame->set_url(main_frame_url_.spec());
+  password_protection_service_->FillReferrerChain(main_frame_url_, -1,

[Nathan Parker, 2017/03/30 21:38:12]

Is there a TODO here to add other iframes?  Or would that go elsewhere?

[Jialiu Lin, 2017/03/30 23:23:05]

Added a TODO

+                                                  main_frame);
+}
+
 void PasswordProtectionRequest::SendRequest() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  LoginReputationClientRequest request;
-  request.set_page_url(main_frame_url_.spec());
-  request.set_trigger_type(request_type_);
-  request.set_stored_verdict_cnt(
-      password_protection_service_->GetStoredVerdictCount());
+  FillRequestProto();
 
   std::string serialized_request;
-  if (!request.SerializeToString(&serialized_request)) {
+  if (!request_proto_->SerializeToString(&serialized_request)) {
     Finish(RequestOutcome::REQUEST_MALFORMED, nullptr);
     return;
   }
 
   // In case the request take too long, we set a timer to cancel this request.
   StartTimeout();
 
   fetcher_ = net::URLFetcher::Create(
       0, PasswordProtectionService::GetPasswordProtectionRequestUrl(),
       net::URLFetcher::POST, this);
@@ skipping 84 matching lines @@
 }
 
 void PasswordProtectionRequest::Cancel(bool timed_out) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   fetcher_.reset();
 
   Finish(timed_out ? TIMEDOUT : CANCELED, nullptr);
 }
 
 }  // namespace safe_browsing