Credential Management: Rename 'LocalCredential' to 'PasswordCredential' (2/3)

components/password_manager/content/renderer/credential_manager_client_browsertest.cc

 // Copyright 2014 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/password_manager/content/common/credential_manager_messages.h"
 #include "components/password_manager/content/renderer/credential_manager_client.h"
 #include "content/public/test/render_view_test.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebCredential.h"
 #include "third_party/WebKit/public/platform/WebCredentialManagerClient.h"
 #include "third_party/WebKit/public/platform/WebCredentialManagerError.h"
-#include "third_party/WebKit/public/platform/WebLocalCredential.h"
+#include "third_party/WebKit/public/platform/WebPasswordCredential.h"
 
 namespace password_manager {
 
 namespace {
 
 // This test has crashed on Android since commit
 // d94a4430bc4448406b7564790d06110c7c5bcaaf was merged.
 // http://crbug.com/481415
 #if defined(OS_ANDROID)
 #define MAYBE_CredentialManagerClientTest DISABLED_CredentialManagerClientTest
 #else
 #define MAYBE_CredentialManagerClientTest CredentialManagerClientTest
 #endif  // defined(OS_ANDROID)
 
 class MAYBE_CredentialManagerClientTest : public content::RenderViewTest {
  public:
   MAYBE_CredentialManagerClientTest()
       : callback_errored_(false), callback_succeeded_(false) {}
   ~MAYBE_CredentialManagerClientTest() override {}
 
   void SetUp() override {
     content::RenderViewTest::SetUp();
-    credential_.reset(new blink::WebLocalCredential("", "", GURL(), ""));
+    credential_.reset(new blink::WebPasswordCredential("", "", "", GURL()));
     client_.reset(new CredentialManagerClient(view_));
   }
 
   void TearDown() override {
     credential_.reset();
     client_.reset();
     content::RenderViewTest::TearDown();
   }
 
   IPC::TestSink& sink() { return render_thread_->sink(); }
@@ skipping 58 matching lines @@
   scoped_ptr<CredentialManagerClient> client_;
 
   // True if a message's callback's 'onSuccess'/'onError' methods were called,
   // false otherwise. We put these on the test object rather than on the
   // Test*Callbacks objects because ownership of those objects passes into the
   // client, which destroys the callbacks after calling them to resolve the
   // pending Blink-side Promise.
   bool callback_errored_;
   bool callback_succeeded_;
 
-  scoped_ptr<blink::WebLocalCredential> credential_;
+  scoped_ptr<blink::WebPasswordCredential> credential_;
 };
 
 class TestNotificationCallbacks
     : public blink::WebCredentialManagerClient::NotificationCallbacks {
  public:
   explicit TestNotificationCallbacks(MAYBE_CredentialManagerClientTest* test)
       : test_(test) {}
 
   virtual ~TestNotificationCallbacks() {}
 
@@ skipping 86 matching lines @@
                                 request_id));
 
   scoped_ptr<TestRequestCallbacks> callbacks(new TestRequestCallbacks(this));
   std::vector<GURL> federations;
   client_->dispatchRequest(false, federations, callbacks.release());
 
   EXPECT_TRUE(ExtractRequestId(CredentialManagerHostMsg_RequestCredential::ID,
                                request_id));
 
   CredentialInfo info;
-  info.type = CredentialType::CREDENTIAL_TYPE_LOCAL;
+  info.type = CredentialType::CREDENTIAL_TYPE_PASSWORD;
   client_->OnSendCredential(request_id, info);
   EXPECT_TRUE(callback_succeeded());
   EXPECT_FALSE(callback_errored());
 }
 
 TEST_F(MAYBE_CredentialManagerClientTest, SendRequestCredentialEmpty) {
   int request_id;
   EXPECT_FALSE(ExtractRequestId(CredentialManagerHostMsg_RequestCredential::ID,
                                 request_id));
 
   scoped_ptr<TestRequestCallbacks> callbacks(new TestRequestCallbacks(this));
   std::vector<GURL> federations;
   client_->dispatchRequest(false, federations, callbacks.release());
 
   EXPECT_TRUE(ExtractRequestId(CredentialManagerHostMsg_RequestCredential::ID,
                                request_id));
 
   CredentialInfo info;  // Send an empty credential in response.
   client_->OnSendCredential(request_id, info);
   EXPECT_TRUE(callback_succeeded());
   EXPECT_FALSE(callback_errored());
 }
 
 }  // namespace password_manager