| Index: android_webview/browser/permission/permission_request_handler_unittest.cc
|
| diff --git a/android_webview/native/permission/permission_request_handler_unittest.cc b/android_webview/browser/permission/permission_request_handler_unittest.cc
|
| similarity index 84%
|
| rename from android_webview/native/permission/permission_request_handler_unittest.cc
|
| rename to android_webview/browser/permission/permission_request_handler_unittest.cc
|
| index 6f20a7c286f02a34d015a0bcd54281f3cea3c9ef..e0c9a83fb4142b2df4f6dfe44efbd6dbfd2d3c8b 100644
|
| --- a/android_webview/native/permission/permission_request_handler_unittest.cc
|
| +++ b/android_webview/browser/permission/permission_request_handler_unittest.cc
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/native/permission/permission_request_handler.h"
|
| +#include "android_webview/browser/permission/permission_request_handler.h"
|
|
|
| #include <utility>
|
|
|
| -#include "android_webview/native/permission/aw_permission_request.h"
|
| -#include "android_webview/native/permission/aw_permission_request_delegate.h"
|
| -#include "android_webview/native/permission/permission_request_handler_client.h"
|
| +#include "android_webview/browser/permission/aw_permission_request.h"
|
| +#include "android_webview/browser/permission/aw_permission_request_delegate.h"
|
| +#include "android_webview/browser/permission/permission_request_handler_client.h"
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -37,24 +37,21 @@ class TestAwPermissionRequestDelegate : public AwPermissionRequestDelegate {
|
| base::Callback<void(bool)> callback_;
|
| };
|
|
|
| -class TestPermissionRequestHandlerClient :
|
| - public PermissionRequestHandlerClient {
|
| +class TestPermissionRequestHandlerClient
|
| + : public PermissionRequestHandlerClient {
|
| public:
|
| struct Permission {
|
| - Permission()
|
| - :resources(0) {}
|
| + Permission() : resources(0) {}
|
| Permission(const GURL& origin, int64_t resources)
|
| : origin(origin), resources(resources) {}
|
| GURL origin;
|
| int64_t resources;
|
| };
|
|
|
| - TestPermissionRequestHandlerClient()
|
| - : request_(NULL) {}
|
| + TestPermissionRequestHandlerClient() : request_(NULL) {}
|
|
|
| - void OnPermissionRequest(
|
| - base::android::ScopedJavaLocalRef<jobject> j_request,
|
| - AwPermissionRequest* request) override {
|
| + void OnPermissionRequest(base::android::ScopedJavaLocalRef<jobject> j_request,
|
| + AwPermissionRequest* request) override {
|
| DCHECK(request);
|
| request_ = request;
|
| java_request_ = j_request;
|
| @@ -67,17 +64,11 @@ class TestPermissionRequestHandlerClient :
|
| Permission(request->GetOrigin(), request->GetResources());
|
| }
|
|
|
| - AwPermissionRequest* request() {
|
| - return request_;
|
| - }
|
| + AwPermissionRequest* request() { return request_; }
|
|
|
| - const Permission& requested_permission() {
|
| - return requested_permission_;
|
| - }
|
| + const Permission& requested_permission() { return requested_permission_; }
|
|
|
| - const Permission& canceled_permission() {
|
| - return canceled_permission_;
|
| - }
|
| + const Permission& canceled_permission() { return canceled_permission_; }
|
|
|
| void Grant() {
|
| request_->OnAccept(NULL, NULL, true);
|
| @@ -107,27 +98,20 @@ class TestPermissionRequestHandlerClient :
|
| class TestPermissionRequestHandler : public PermissionRequestHandler {
|
| public:
|
| TestPermissionRequestHandler(PermissionRequestHandlerClient* client)
|
| - : PermissionRequestHandler(client, NULL) {
|
| - }
|
| + : PermissionRequestHandler(client, NULL) {}
|
|
|
| - const std::vector<base::WeakPtr<AwPermissionRequest> > requests() {
|
| + const std::vector<base::WeakPtr<AwPermissionRequest>> requests() {
|
| return requests_;
|
| }
|
|
|
| - void PruneRequests() {
|
| - return PermissionRequestHandler::PruneRequests();
|
| - }
|
| + void PruneRequests() { return PermissionRequestHandler::PruneRequests(); }
|
| };
|
|
|
| class PermissionRequestHandlerTest : public testing::Test {
|
| public:
|
| - PermissionRequestHandlerTest()
|
| - : handler_(&client_),
|
| - allowed_(false) {}
|
| + PermissionRequestHandlerTest() : handler_(&client_), allowed_(false) {}
|
|
|
| - void NotifyRequestResult(bool allowed) {
|
| - allowed_ = allowed;
|
| - }
|
| + void NotifyRequestResult(bool allowed) { allowed_ = allowed; }
|
|
|
| protected:
|
| void SetUp() override {
|
| @@ -135,16 +119,13 @@ class PermissionRequestHandlerTest : public testing::Test {
|
| origin_ = GURL("http://www.google.com");
|
| resources_ =
|
| AwPermissionRequest::VideoCapture | AwPermissionRequest::AudioCapture;
|
| - delegate_.reset(
|
| - new TestAwPermissionRequestDelegate(
|
| - origin_, resources_, base::Bind(
|
| - &PermissionRequestHandlerTest::NotifyRequestResult,
|
| - base::Unretained(this))));
|
| + delegate_.reset(new TestAwPermissionRequestDelegate(
|
| + origin_, resources_,
|
| + base::Bind(&PermissionRequestHandlerTest::NotifyRequestResult,
|
| + base::Unretained(this))));
|
| }
|
|
|
| - const GURL& origin() {
|
| - return origin_;
|
| - }
|
| + const GURL& origin() { return origin_; }
|
|
|
| int64_t resources() { return resources_; }
|
|
|
| @@ -152,17 +133,11 @@ class PermissionRequestHandlerTest : public testing::Test {
|
| return std::move(delegate_);
|
| }
|
|
|
| - TestPermissionRequestHandler* handler() {
|
| - return &handler_;
|
| - }
|
| + TestPermissionRequestHandler* handler() { return &handler_; }
|
|
|
| - TestPermissionRequestHandlerClient* client() {
|
| - return &client_;
|
| - }
|
| + TestPermissionRequestHandlerClient* client() { return &client_; }
|
|
|
| - bool allowed() {
|
| - return allowed_;
|
| - }
|
| + bool allowed() { return allowed_; }
|
|
|
| private:
|
| GURL origin_;
|
| @@ -246,7 +221,8 @@ TEST_F(PermissionRequestHandlerTest, TestMultiplePermissionRequest) {
|
| EXPECT_EQ(resources1, client()->request()->GetResources());
|
|
|
| // Send 3rd request which has same origin and resources as first one.
|
| - delegate1.reset(new TestAwPermissionRequestDelegate(origin(), resources(),
|
| + delegate1.reset(new TestAwPermissionRequestDelegate(
|
| + origin(), resources(),
|
| base::Bind(&PermissionRequestHandlerTest::NotifyRequestResult,
|
| base::Unretained(this))));
|
| handler()->SendRequest(std::move(delegate1));
|
| @@ -299,7 +275,7 @@ TEST_F(PermissionRequestHandlerTest, TestOriginNotPreauthorized) {
|
| handler()->PreauthorizePermission(origin(), resources());
|
|
|
| // Ask the origin which wasn't preauthorized.
|
| - GURL origin ("http://a.google.com/a/b");
|
| + GURL origin("http://a.google.com/a/b");
|
| std::unique_ptr<AwPermissionRequestDelegate> delegate;
|
| int64_t requested_resources = AwPermissionRequest::AudioCapture;
|
| delegate.reset(new TestAwPermissionRequestDelegate(
|
| @@ -335,9 +311,9 @@ TEST_F(PermissionRequestHandlerTest, TestResourcesNotPreauthorized) {
|
| TEST_F(PermissionRequestHandlerTest, TestPreauthorizeMultiplePermission) {
|
| handler()->PreauthorizePermission(origin(), resources());
|
| // Preauthorize another permission.
|
| - GURL origin ("http://a.google.com/a/b");
|
| + GURL origin("http://a.google.com/a/b");
|
| handler()->PreauthorizePermission(origin, AwPermissionRequest::Geolocation);
|
| - GURL origin_hostname ("http://a.google.com/");
|
| + GURL origin_hostname("http://a.google.com/");
|
| std::unique_ptr<AwPermissionRequestDelegate> delegate;
|
| delegate.reset(new TestAwPermissionRequestDelegate(
|
| origin_hostname, AwPermissionRequest::Geolocation,
|
|
|