1 files changed, 11 insertions, 16 deletions

diff --git a/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc b/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
index dac6454aaa9..bf3b3053e74 100644
--- a/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
+++ b/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
@@ -34,24 +34,24 @@ static const size_t kNumMocks = 3;
 static const int kNumCharactersInPassword = 10;
 static const char kPlaintextPassword[] = "plaintext";
 
-api::passwords_private::PasswordUiEntry CreateEntry(size_t num) {
+api::passwords_private::PasswordUiEntry CreateEntry(int id) {
   api::passwords_private::PasswordUiEntry entry;
-  entry.login_pair.urls.shown = "test" + std::to_string(num) + ".com";
+  entry.login_pair.urls.shown = "test" + std::to_string(id) + ".com";
   entry.login_pair.urls.origin =
       "http://" + entry.login_pair.urls.shown + "/login";
   entry.login_pair.urls.link = entry.login_pair.urls.origin;
-  entry.login_pair.username = "testName" + std::to_string(num);
+  entry.login_pair.username = "testName" + std::to_string(id);
   entry.num_characters_in_password = kNumCharactersInPassword;
-  entry.index = num;
+  entry.id = id;
   return entry;
 }
 
-api::passwords_private::ExceptionEntry CreateException(size_t num) {
+api::passwords_private::ExceptionEntry CreateException(int id) {
   api::passwords_private::ExceptionEntry exception;
-  exception.urls.shown = "exception" + std::to_string(num) + ".com";
+  exception.urls.shown = "exception" + std::to_string(id) + ".com";
   exception.urls.origin = "http://" + exception.urls.shown + "/login";
   exception.urls.link = exception.urls.origin;
-  exception.index = num;
+  exception.id = id;
   return exception;
 }
 
@@ -93,7 +93,7 @@ class TestDelegate : public PasswordsPrivateDelegate {
     callback.Run(current_exceptions_);
   }
 
-  void RemoveSavedPassword(size_t index) override {
+  void RemoveSavedPassword(int id) override {
     if (current_entries_.empty())
       return;
 
@@ -104,10 +104,7 @@ class TestDelegate : public PasswordsPrivateDelegate {
     SendSavedPasswordsList();
   }
 
-  void RemovePasswordException(size_t index) override {
-    if (index >= current_exceptions_.size())
-      return;
-
+  void RemovePasswordException(int id) override {
     // Since this is just mock data, remove the first entry regardless of
     // the data contained.
     last_deleted_exception_ = std::move(current_exceptions_.front());
@@ -130,16 +127,14 @@ class TestDelegate : public PasswordsPrivateDelegate {
     }
   }
 
-  void RequestShowPassword(size_t index,
+  void RequestShowPassword(int id,
                            content::WebContents* web_contents) override {
     // Return a mocked password value.
     std::string plaintext_password(kPlaintextPassword);
     PasswordsPrivateEventRouter* router =
         PasswordsPrivateEventRouterFactory::GetForProfile(profile_);
     if (router) {
-      if (index >= current_entries_.size())
-        return;
-      router->OnPlaintextPasswordFetched(index, plaintext_password);
+      router->OnPlaintextPasswordFetched(id, plaintext_password);
     }
   }