summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/shelf/shelf_view_unittest.cc7
-rw-r--r--components/mus/ws/window_tree_apptest.cc15
-rw-r--r--content/browser/site_per_process_browsertest.cc1
-rw-r--r--media/cast/net/rtcp/rtcp_unittest.cc1
-rw-r--r--media/mojo/services/mojo_cdm_service.cc2
-rw-r--r--media/mojo/services/mojo_cdm_service.h3
-rw-r--r--media/mojo/services/service_factory_impl.cc4
-rw-r--r--sync/internal_api/public/util/proto_value_ptr_unittest.cc1
-rw-r--r--ui/app_list/views/app_list_view_unittest.cc8
9 files changed, 17 insertions, 25 deletions
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index efd75ad..80091d3 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -243,8 +243,7 @@ TEST_F(ShelfViewIconObserverTest, BoundsChanged) {
// value of IsAppPinned(...) is configurable.
class TestShelfDelegateForShelfView : public ShelfDelegate {
public:
- explicit TestShelfDelegateForShelfView(ShelfModel* model)
- : model_(model) {}
+ TestShelfDelegateForShelfView() {}
~TestShelfDelegateForShelfView() override {}
void set_is_app_pinned(bool is_pinned) { is_app_pinned_ = is_pinned; }
@@ -278,8 +277,6 @@ class TestShelfDelegateForShelfView : public ShelfDelegate {
void UnpinAppWithID(const std::string& app_id) override { NOTREACHED(); }
private:
- ShelfModel* model_;
-
// Tracks whether apps are pinned or not.
bool is_app_pinned_ = false;
@@ -681,7 +678,7 @@ class ShelfViewTest : public AshTestBase {
// Replace ShelfDelegate.
test::ShellTestApi shell_test_api(Shell::GetInstance());
shell_test_api.SetShelfDelegate(NULL);
- shelf_delegate_ = new TestShelfDelegateForShelfView(model_);
+ shelf_delegate_ = new TestShelfDelegateForShelfView();
shell_test_api.SetShelfDelegate(shelf_delegate_);
test::ShelfTestAPI(Shelf::ForPrimaryDisplay())
.SetShelfDelegate(shelf_delegate_);
diff --git a/components/mus/ws/window_tree_apptest.cc b/components/mus/ws/window_tree_apptest.cc
index 58dc59b..da25034 100644
--- a/components/mus/ws/window_tree_apptest.cc
+++ b/components/mus/ws/window_tree_apptest.cc
@@ -122,9 +122,8 @@ std::string WindowParentToString(Id window, Id parent) {
class TestWindowTreeClientImpl : public mojom::WindowTreeClient,
public TestChangeTracker::Delegate {
public:
- explicit TestWindowTreeClientImpl(mojo::ApplicationImpl* app)
+ TestWindowTreeClientImpl()
: binding_(this),
- app_(app),
connection_id_(0),
root_window_id_(0),
// Start with a random large number so tests can use lower ids if they
@@ -378,7 +377,6 @@ class TestWindowTreeClientImpl : public mojom::WindowTreeClient,
scoped_ptr<WaitState> wait_state_;
mojo::Binding<WindowTreeClient> binding_;
- mojo::ApplicationImpl* app_;
Id connection_id_;
Id root_window_id_;
uint32_t next_change_id_;
@@ -395,7 +393,7 @@ class TestWindowTreeClientImpl : public mojom::WindowTreeClient,
class WindowTreeClientFactory
: public mojo::InterfaceFactory<WindowTreeClient> {
public:
- explicit WindowTreeClientFactory(mojo::ApplicationImpl* app) : app_(app) {}
+ WindowTreeClientFactory() {}
~WindowTreeClientFactory() override {}
// Runs a nested MessageLoop until a new instance has been created.
@@ -413,13 +411,12 @@ class WindowTreeClientFactory
// InterfaceFactory<WindowTreeClient>:
void Create(ApplicationConnection* connection,
InterfaceRequest<WindowTreeClient> request) override {
- client_impl_.reset(new TestWindowTreeClientImpl(app_));
+ client_impl_.reset(new TestWindowTreeClientImpl());
client_impl_->Bind(std::move(request));
if (run_loop_.get())
run_loop_->Quit();
}
- mojo::ApplicationImpl* app_;
scoped_ptr<TestWindowTreeClientImpl> client_impl_;
scoped_ptr<base::RunLoop> run_loop_;
@@ -531,13 +528,13 @@ class WindowTreeAppTest : public mojo::test::ApplicationTestBase,
ApplicationDelegate* GetApplicationDelegate() override { return this; }
void SetUp() override {
ApplicationTestBase::SetUp();
- client_factory_.reset(new WindowTreeClientFactory(application_impl()));
+ client_factory_.reset(new WindowTreeClientFactory());
mojom::WindowTreeHostFactoryPtr factory;
application_impl()->ConnectToService("mojo:mus", &factory);
mojom::WindowTreeClientPtr tree_client_ptr;
- ws_client1_.reset(new TestWindowTreeClientImpl(application_impl()));
+ ws_client1_.reset(new TestWindowTreeClientImpl());
ws_client1_->Bind(GetProxy(&tree_client_ptr));
factory->CreateWindowTreeHost(GetProxy(&host_),
@@ -1642,7 +1639,7 @@ TEST_F(WindowTreeAppTest, DontCleanMapOnDestroy) {
TEST_F(WindowTreeAppTest, EmbedSupplyingWindowTreeClient) {
ASSERT_TRUE(ws_client1()->NewWindow(1));
- TestWindowTreeClientImpl client2(application_impl());
+ TestWindowTreeClientImpl client2;
mojom::WindowTreeClientPtr client2_ptr;
mojo::Binding<WindowTreeClient> client2_binding(&client2, &client2_ptr);
ASSERT_TRUE(Embed(ws1(), BuildWindowId(connection_id_1(), 1),
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 08f4c26..6aacbff 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -545,7 +545,6 @@ class RenderWidgetHostVisibilityObserver : public NotificationObserver {
message_loop_runner_->Quit();
}
- RenderWidgetHostImpl* render_widget_host_;
bool expected_visibility_state_;
scoped_refptr<MessageLoopRunner> message_loop_runner_;
NotificationRegistrar registrar_;
diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc
index 5262f69..f26f935 100644
--- a/media/cast/net/rtcp/rtcp_unittest.cc
+++ b/media/cast/net/rtcp/rtcp_unittest.cc
@@ -70,7 +70,6 @@ class FakeRtcpTransport : public PacedPacketSender {
base::SimpleTestTickClock* const clock_;
base::TimeDelta packet_delay_;
RtcpSession* rtcp_session_; // RTCP destination.
- bool paused_;
DISALLOW_COPY_AND_ASSIGN(FakeRtcpTransport);
};
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index 31781b1..e2fa9e2 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -79,12 +79,10 @@ scoped_refptr<MediaKeys> MojoCdmService::GetCdm(int cdm_id) {
MojoCdmService::MojoCdmService(
base::WeakPtr<MojoCdmServiceContext> context,
- mojo::ServiceProvider* service_provider,
CdmFactory* cdm_factory,
mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request)
: binding_(this, std::move(request)),
context_(context),
- service_provider_(service_provider),
cdm_factory_(cdm_factory),
cdm_id_(CdmContext::kInvalidCdmId),
weak_factory_(this) {
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index 76dd115..c99ef31 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -18,7 +18,6 @@
#include "media/mojo/services/mojo_cdm_service_context.h"
#include "media/mojo/services/mojo_decryptor_service.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/shell/public/interfaces/service_provider.mojom.h"
namespace media {
@@ -41,7 +40,6 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {
// Constructs a MojoCdmService and strongly binds it to the |request|.
MojoCdmService(
base::WeakPtr<MojoCdmServiceContext> context,
- mojo::ServiceProvider* service_provider,
CdmFactory* cdm_factory,
mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request);
@@ -117,7 +115,6 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {
mojo::StrongBinding<interfaces::ContentDecryptionModule> binding_;
base::WeakPtr<MojoCdmServiceContext> context_;
- mojo::ServiceProvider* service_provider_;
CdmFactory* cdm_factory_;
scoped_refptr<MediaKeys> cdm_;
diff --git a/media/mojo/services/service_factory_impl.cc b/media/mojo/services/service_factory_impl.cc
index d00efdb..2c515be 100644
--- a/media/mojo/services/service_factory_impl.cc
+++ b/media/mojo/services/service_factory_impl.cc
@@ -55,8 +55,8 @@ void ServiceFactoryImpl::CreateRenderer(
void ServiceFactoryImpl::CreateCdm(
mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request) {
// The created object is owned by the pipe.
- new MojoCdmService(cdm_service_context_.GetWeakPtr(), service_provider_,
- GetCdmFactory(), std::move(request));
+ new MojoCdmService(cdm_service_context_.GetWeakPtr(), GetCdmFactory(),
+ std::move(request));
}
RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
diff --git a/sync/internal_api/public/util/proto_value_ptr_unittest.cc b/sync/internal_api/public/util/proto_value_ptr_unittest.cc
index d522317..f439825 100644
--- a/sync/internal_api/public/util/proto_value_ptr_unittest.cc
+++ b/sync/internal_api/public/util/proto_value_ptr_unittest.cc
@@ -100,7 +100,6 @@ class TestValue {
static int g_delete_count;
scoped_ptr<IntValue> value_;
- bool is_initialized_;
bool is_default_;
DISALLOW_COPY_AND_ASSIGN(TestValue);
diff --git a/ui/app_list/views/app_list_view_unittest.cc b/ui/app_list/views/app_list_view_unittest.cc
index 63872f6..477875f 100644
--- a/ui/app_list/views/app_list_view_unittest.cc
+++ b/ui/app_list/views/app_list_view_unittest.cc
@@ -727,7 +727,11 @@ class AppListViewTestDesktop : public views::ViewsTestBase,
class AppListViewTestViewsDelegate : public views::TestViewsDelegate {
public:
explicit AppListViewTestViewsDelegate(AppListViewTestDesktop* parent)
- : parent_(parent) {}
+#if defined(OS_CHROMEOS)
+ : parent_(parent)
+#endif
+ {
+ }
// Overridden from views::ViewsDelegate:
void OnBeforeWidgetInit(
@@ -735,7 +739,9 @@ class AppListViewTestDesktop : public views::ViewsTestBase,
views::internal::NativeWidgetDelegate* delegate) override;
private:
+#if defined(OS_CHROMEOS)
AppListViewTestDesktop* parent_;
+#endif
DISALLOW_COPY_AND_ASSIGN(AppListViewTestViewsDelegate);
};
generated by cgit v1.1 at 2024-09-22 13:37:12 +0000