Commit 5964cda5 authored by Douglas Creager's avatar Douglas Creager Committed by Commit Bot

Move MockPermissionManager into //content/public/test

This lets us use it in tests under //chrome/browser.

Bug: 704259
Change-Id: Ic814dd88e5a676e13a0b9629fc422ec70df4f6cd
Reviewed-on: https://chromium-review.googlesource.com/941642
Commit-Queue: Douglas Creager <dcreager@google.com>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#540179}
parent c7e5bca6
......@@ -34,11 +34,11 @@
#include "content/public/browser/background_sync_parameters.h"
#include "content/public/browser/permission_type.h"
#include "content/public/test/background_sync_test_util.h"
#include "content/public/test/mock_permission_manager.h"
#include "content/public/test/test_browser_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
#include "content/test/mock_background_sync_controller.h"
#include "content/test/mock_permission_manager.h"
#include "content/test/test_background_sync_manager.h"
#include "net/base/network_change_notifier.h"
#include "testing/gmock/include/gmock/gmock.h"
......
......@@ -20,9 +20,9 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/permission_type.h"
#include "content/public/test/background_sync_test_util.h"
#include "content/public/test/mock_permission_manager.h"
#include "content/public/test/test_browser_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/test/mock_permission_manager.h"
#include "content/test/test_background_sync_context.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
#include "net/base/network_change_notifier.h"
......
......@@ -11,9 +11,9 @@
#include "content/public/browser/permission_type.h"
#include "content/public/common/content_features.h"
#include "content/public/common/service_manager_connection.h"
#include "content/public/test/mock_permission_manager.h"
#include "content/public/test/navigation_simulator.h"
#include "content/public/test/test_service_manager_context.h"
#include "content/test/mock_permission_manager.h"
#include "content/test/test_render_frame_host.h"
#include "device/geolocation/public/cpp/scoped_geolocation_overrider.h"
#include "services/device/public/mojom/constants.mojom.h"
......
......@@ -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 "content/test/mock_permission_manager.h"
#include "content/public/test/mock_permission_manager.h"
#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_TEST_MOCK_PERMISSION_MANAGER_H_
#define CONTENT_TEST_MOCK_PERMISSION_MANAGER_H_
#ifndef CONTENT_PUBLIC_TEST_MOCK_PERMISSION_MANAGER_H_
#define CONTENT_PUBLIC_TEST_MOCK_PERMISSION_MANAGER_H_
#include "content/public/browser/permission_manager.h"
#include "testing/gmock/include/gmock/gmock.h"
......@@ -59,4 +59,4 @@ class MockPermissionManager : public PermissionManager {
} // namespace content
#endif // CONTENT_TEST_MOCK_PERMISSION_MANAGER_H_
#endif // CONTENT_PUBLIC_TEST_MOCK_PERMISSION_MANAGER_H_
......@@ -98,6 +98,8 @@ jumbo_static_library("test_support") {
"../public/test/mock_download_manager.h",
"../public/test/mock_notification_observer.cc",
"../public/test/mock_notification_observer.h",
"../public/test/mock_permission_manager.cc",
"../public/test/mock_permission_manager.h",
"../public/test/mock_render_process_host.cc",
"../public/test/mock_render_process_host.h",
"../public/test/mock_render_thread.cc",
......@@ -206,8 +208,6 @@ jumbo_static_library("test_support") {
"mock_keyboard_driver_win.cc",
"mock_keyboard_driver_win.h",
"mock_overscroll_observer.h",
"mock_permission_manager.cc",
"mock_permission_manager.h",
"mock_platform_notification_service.cc",
"mock_platform_notification_service.h",
"mock_render_process.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment