| Index: android_webview/browser/aw_contents_client_bridge_unittest.cc
|
| diff --git a/android_webview/native/aw_contents_client_bridge_unittest.cc b/android_webview/browser/aw_contents_client_bridge_unittest.cc
|
| similarity index 90%
|
| rename from android_webview/native/aw_contents_client_bridge_unittest.cc
|
| rename to android_webview/browser/aw_contents_client_bridge_unittest.cc
|
| index 1b100e3dd85388afb7849811623071c2362b9d87..923dee9fd34fcea9b2258b719691f647921f6226 100644
|
| --- a/android_webview/native/aw_contents_client_bridge_unittest.cc
|
| +++ b/android_webview/browser/aw_contents_client_bridge_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/native/aw_contents_client_bridge.h"
|
| +#include "android_webview/browser/aw_contents_client_bridge.h"
|
|
|
| #include <memory>
|
|
|
| @@ -36,10 +36,11 @@ namespace {
|
| // Tests the android_webview contents client bridge.
|
| class AwContentsClientBridgeTest : public Test {
|
| public:
|
| - AwContentsClientBridgeTest() { }
|
| + AwContentsClientBridgeTest() {}
|
|
|
| // Callback method called when a cert is selected.
|
| void CertSelected(X509Certificate* cert);
|
| +
|
| protected:
|
| void SetUp() override;
|
| void TestCertType(SSLClientCertType type, const std::string& expected_name);
|
| @@ -71,14 +72,15 @@ class TestClientCertificateDelegate
|
| DISALLOW_COPY_AND_ASSIGN(TestClientCertificateDelegate);
|
| };
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| void AwContentsClientBridgeTest::SetUp() {
|
| env_ = AttachCurrentThread();
|
| ASSERT_THAT(env_, NotNull());
|
| ASSERT_TRUE(android_webview::RegisterAwContentsClientBridge(env_));
|
| ASSERT_TRUE(net::android::RegisterJni(env_));
|
| - jbridge_.Reset(env_,
|
| + jbridge_.Reset(
|
| + env_,
|
| Java_MockAwContentsClientBridge_getAwContentsClientBridge(env_).obj());
|
| bridge_.reset(new AwContentsClientBridge(env_, jbridge_));
|
| selected_cert_ = nullptr;
|
| @@ -101,8 +103,9 @@ TEST_F(AwContentsClientBridgeTest, TestClientCertKeyTypesCorrectlyEncoded) {
|
| }
|
| }
|
|
|
| -void AwContentsClientBridgeTest::TestCertType(SSLClientCertType type,
|
| - const std::string& expected_name) {
|
| +void AwContentsClientBridgeTest::TestCertType(
|
| + SSLClientCertType type,
|
| + const std::string& expected_name) {
|
| cert_request_info_->cert_key_types.clear();
|
| cert_request_info_->cert_key_types.push_back(type);
|
| bridge_->SelectClientCertificate(
|
| @@ -113,8 +116,7 @@ void AwContentsClientBridgeTest::TestCertType(SSLClientCertType type,
|
| ScopedJavaLocalRef<jobjectArray> key_types =
|
| Java_MockAwContentsClientBridge_getKeyTypes(env_, jbridge_);
|
| std::vector<std::string> vec;
|
| - base::android::AppendJavaStringArrayToStringVector(env_,
|
| - key_types.obj(),
|
| + base::android::AppendJavaStringArrayToStringVector(env_, key_types.obj(),
|
| &vec);
|
| EXPECT_EQ(1u, vec.size());
|
| EXPECT_EQ(expected_name, vec[0]);
|
| @@ -123,7 +125,7 @@ void AwContentsClientBridgeTest::TestCertType(SSLClientCertType type,
|
| // Verify that ProvideClientCertificateResponse works properly when the client
|
| // responds with a null key.
|
| TEST_F(AwContentsClientBridgeTest,
|
| - TestProvideClientCertificateResponseCallsCallbackOnNullKey) {
|
| + TestProvideClientCertificateResponseCallsCallbackOnNullKey) {
|
| // Call SelectClientCertificate to create a callback id that mock java object
|
| // can call on.
|
| bridge_->SelectClientCertificate(
|
| @@ -142,7 +144,7 @@ TEST_F(AwContentsClientBridgeTest,
|
| // Verify that ProvideClientCertificateResponse calls the callback with
|
| // null parameters when private key is not provided.
|
| TEST_F(AwContentsClientBridgeTest,
|
| - TestProvideClientCertificateResponseCallsCallbackOnNullChain) {
|
| + TestProvideClientCertificateResponseCallsCallbackOnNullChain) {
|
| // Call SelectClientCertificate to create a callback id that mock java object
|
| // can call on.
|
| bridge_->SelectClientCertificate(
|
| @@ -156,4 +158,4 @@ TEST_F(AwContentsClientBridgeTest,
|
| EXPECT_EQ(1, cert_selected_callbacks_);
|
| }
|
|
|
| -} // android_webview
|
| +} // android_webview
|
|
|