From 10cf76e32672cdbc6adc90259f8ab7ea95e06fe9 Mon Sep 17 00:00:00 2001 From: pkasting Date: Thu, 19 May 2016 11:10:37 -0700 Subject: [PATCH] Fix "unused variable" warnings. These were exposed by changing DISALLOW_COPY_AND_ASSIGN to use "= delete", and must be fixed before that change can land. See https://codereview.chromium.org/1981053002/ for the full CL. BUG=447156 TEST=none Review-Url: https://codereview.chromium.org/1995573004 Cr-Commit-Position: refs/heads/master@{#394814} --- .../sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc | 6 +++++- .../common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h | 2 ++ .../common/sandbox_linux/sandbox_seccomp_bpf_linux.cc | 8 ++------ .../media/webrtc/media_stream_remote_video_source.cc | 4 ---- content/renderer/renderer_main_platform_delegate.h | 9 --------- content/renderer/renderer_main_platform_delegate_win.cc | 4 +--- content/renderer/text_input_client_observer.cc | 7 +++++-- content/renderer/text_input_client_observer.h | 2 ++ content/shell/browser/shell_javascript_dialog.h | 2 +- content/shell/browser/shell_javascript_dialog_mac.mm | 3 +-- content/shell/browser/shell_javascript_dialog_win.cc | 4 ++-- content/test/mock_keyboard.cc | 5 +---- content/test/mock_keyboard.h | 5 ++--- 13 files changed, 24 insertions(+), 37 deletions(-) diff --git a/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc b/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc index ac6de8b5fe749..012a7f678b95b 100644 --- a/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc +++ b/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc @@ -118,7 +118,11 @@ ResultExpr CrosArmGpuBrokerProcessPolicy::EvaluateSyscall(int sysno) const { } // namespace CrosArmGpuProcessPolicy::CrosArmGpuProcessPolicy(bool allow_shmat) - : allow_shmat_(allow_shmat) {} +#if defined(__arm__) || defined(__aarch64__) + : allow_shmat_(allow_shmat) +#endif +{ +} CrosArmGpuProcessPolicy::~CrosArmGpuProcessPolicy() {} diff --git a/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h b/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h index a9c1e2dff431b..c026f4e98f82c 100644 --- a/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h +++ b/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h @@ -21,7 +21,9 @@ class CrosArmGpuProcessPolicy : public GpuProcessPolicy { bool PreSandboxHook() override; private: +#if defined(__arm__) || defined(__aarch64__) const bool allow_shmat_; // Allow shmat(2). +#endif DISALLOW_COPY_AND_ASSIGN(CrosArmGpuProcessPolicy); }; diff --git a/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc b/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc index 7a3620ccf667a..4fd335b2e0d00 100644 --- a/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc +++ b/content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc @@ -164,13 +164,9 @@ void RunSandboxSanityChecks(const std::string& process_type) { std::unique_ptr GetGpuProcessSandbox() { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - bool allow_sysv_shm = false; - if (command_line.HasSwitch(switches::kGpuSandboxAllowSysVShm)) { - DCHECK(IsArchitectureArm()); - allow_sysv_shm = true; - } - if (IsChromeOS() && IsArchitectureArm()) { + bool allow_sysv_shm = + command_line.HasSwitch(switches::kGpuSandboxAllowSysVShm); return std::unique_ptr( new CrosArmGpuProcessPolicy(allow_sysv_shm)); } else { diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc index 3d01a0de31779..928b1804c68b1 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" -#include "base/threading/thread_checker.h" #include "base/trace_event/trace_event.h" #include "content/renderer/media/webrtc/track_observer.h" #include "media/base/bind_to_current_loop.h" @@ -45,9 +44,6 @@ class MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate const scoped_refptr& video_frame); private: - // Bound to the render thread. - base::ThreadChecker thread_checker_; - scoped_refptr io_task_runner_; // |frame_callback_| is accessed on the IO thread. diff --git a/content/renderer/renderer_main_platform_delegate.h b/content/renderer/renderer_main_platform_delegate.h index 5eb9af5594080..c1d0e4863edea 100644 --- a/content/renderer/renderer_main_platform_delegate.h +++ b/content/renderer/renderer_main_platform_delegate.h @@ -15,12 +15,6 @@ #include "content/common/content_export.h" #include "content/public/common/main_function_params.h" -#ifdef __OBJC__ -@class NSBundle; -#else -class NSBundle; -#endif // __OBJC__ - namespace content { class CONTENT_EXPORT RendererMainPlatformDelegate { @@ -40,9 +34,6 @@ class CONTENT_EXPORT RendererMainPlatformDelegate { private: #if defined(OS_WIN) const MainFunctionParams& parameters_; - HMODULE sandbox_test_module_; -#elif defined(OS_MACOSX) - NSBundle* sandbox_tests_bundle_; #endif DISALLOW_COPY_AND_ASSIGN(RendererMainPlatformDelegate); diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc index 9641b16ac6804..20efc6dc03192 100644 --- a/content/renderer/renderer_main_platform_delegate_win.cc +++ b/content/renderer/renderer_main_platform_delegate_win.cc @@ -32,9 +32,7 @@ namespace content { RendererMainPlatformDelegate::RendererMainPlatformDelegate( const MainFunctionParams& parameters) - : parameters_(parameters), - sandbox_test_module_(NULL) { -} + : parameters_(parameters) {} RendererMainPlatformDelegate::~RendererMainPlatformDelegate() { } diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc index fd7107b5ef43e..e3b8bd7a37791 100644 --- a/content/renderer/text_input_client_observer.cc +++ b/content/renderer/text_input_client_observer.cc @@ -23,8 +23,11 @@ namespace content { TextInputClientObserver::TextInputClientObserver(RenderViewImpl* render_view) - : RenderViewObserver(render_view), - render_view_impl_(render_view) { +#if defined(ENABLE_PLUGINS) + : RenderViewObserver(render_view), render_view_impl_(render_view) { +#else + : RenderViewObserver(render_view) { +#endif } TextInputClientObserver::~TextInputClientObserver() { diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h index b8c62b62b8c3f..c41b670ce2261 100644 --- a/content/renderer/text_input_client_observer.h +++ b/content/renderer/text_input_client_observer.h @@ -40,7 +40,9 @@ class TextInputClientObserver : public RenderViewObserver { void OnFirstRectForCharacterRange(gfx::Range range); void OnStringForRange(gfx::Range range); +#if defined(ENABLE_PLUGINS) RenderViewImpl* const render_view_impl_; +#endif DISALLOW_COPY_AND_ASSIGN(TextInputClientObserver); }; diff --git a/content/shell/browser/shell_javascript_dialog.h b/content/shell/browser/shell_javascript_dialog.h index 103d0fbcea0f7..b113385640bbb 100644 --- a/content/shell/browser/shell_javascript_dialog.h +++ b/content/shell/browser/shell_javascript_dialog.h @@ -36,12 +36,12 @@ class ShellJavaScriptDialog { void Cancel(); private: - ShellJavaScriptDialogManager* manager_; JavaScriptDialogManager::DialogClosedCallback callback_; #if defined(OS_MACOSX) ShellJavaScriptDialogHelper* helper_; // owned #elif defined(OS_WIN) + ShellJavaScriptDialogManager* manager_; JavaScriptMessageType message_type_; HWND dialog_win_; base::string16 message_text_; diff --git a/content/shell/browser/shell_javascript_dialog_mac.mm b/content/shell/browser/shell_javascript_dialog_mac.mm index 9fc56024b60df..73b0f4bfd63d4 100644 --- a/content/shell/browser/shell_javascript_dialog_mac.mm +++ b/content/shell/browser/shell_javascript_dialog_mac.mm @@ -93,8 +93,7 @@ - (void)cancel { const base::string16& message_text, const base::string16& default_prompt_text, const JavaScriptDialogManager::DialogClosedCallback& callback) - : manager_(manager), - callback_(callback) { + : callback_(callback) { bool text_field = message_type == JAVASCRIPT_MESSAGE_TYPE_PROMPT; bool one_button = message_type == JAVASCRIPT_MESSAGE_TYPE_ALERT; diff --git a/content/shell/browser/shell_javascript_dialog_win.cc b/content/shell/browser/shell_javascript_dialog_win.cc index 562194a3a74ab..f35d0f6ece7a1 100644 --- a/content/shell/browser/shell_javascript_dialog_win.cc +++ b/content/shell/browser/shell_javascript_dialog_win.cc @@ -82,8 +82,8 @@ ShellJavaScriptDialog::ShellJavaScriptDialog( const base::string16& message_text, const base::string16& default_prompt_text, const JavaScriptDialogManager::DialogClosedCallback& callback) - : manager_(manager), - callback_(callback), + : callback_(callback), + manager_(manager), message_type_(message_type), message_text_(message_text), default_prompt_text_(default_prompt_text) { diff --git a/content/test/mock_keyboard.cc b/content/test/mock_keyboard.cc index 9929dae340b5c..d097f39db0b7a 100644 --- a/content/test/mock_keyboard.cc +++ b/content/test/mock_keyboard.cc @@ -9,10 +9,7 @@ namespace content { -MockKeyboard::MockKeyboard() - : keyboard_layout_(LAYOUT_NULL), - keyboard_modifiers_(INVALID) { -} +MockKeyboard::MockKeyboard() {} MockKeyboard::~MockKeyboard() { } diff --git a/content/test/mock_keyboard.h b/content/test/mock_keyboard.h index cb12c27064c27..1e79e56fc76f5 100644 --- a/content/test/mock_keyboard.h +++ b/content/test/mock_keyboard.h @@ -96,10 +96,9 @@ class MockKeyboard { std::wstring* output); private: - Layout keyboard_layout_; - Modifiers keyboard_modifiers_; - #if defined(OS_WIN) + Layout keyboard_layout_ = LAYOUT_NULL; + Modifiers keyboard_modifiers_ = INVALID; MockKeyboardDriverWin driver_; #endif