summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2015-09-15 12:34:31 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-15 19:35:38 +0000
commit774686ba5510905fca654cdeb25cd762b6e3f852 (patch)
tree9b17b00c68db44410635e74fde65d36fac9fd8b3
parent554dcbc60d6e3d51af7dd23b8f59c8562f3912e9 (diff)
downloadchromium_src-774686ba5510905fca654cdeb25cd762b6e3f852.zip
chromium_src-774686ba5510905fca654cdeb25cd762b6e3f852.tar.gz
chromium_src-774686ba5510905fca654cdeb25cd762b6e3f852.tar.bz2
Cleanup: Remove unneeded base/memory/shared_memory.h #includes.
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1341153003 Cr-Commit-Position: refs/heads/master@{#348961}
-rw-r--r--cc/resources/video_resource_updater_unittest.cc1
-rw-r--r--chrome/browser/tracing/crash_service_uploader.cc1
-rw-r--r--chrome/common/media/webrtc_logging_messages.h1
-rw-r--r--chrome/renderer/media/chrome_webrtc_log_message_delegate.h1
-rw-r--r--chrome/test/base/chrome_unit_test_suite.cc4
-rw-r--r--components/nacl/loader/nacl_ipc_adapter.h1
-rw-r--r--content/browser/child_process_launcher.cc3
-rw-r--r--content/browser/renderer_host/media/audio_input_renderer_host.h2
-rw-r--r--content/browser/renderer_host/render_widget_host_unittest.cc5
-rw-r--r--content/common/pepper_file_util.h1
-rw-r--r--content/plugin/webplugin_proxy.cc4
-rw-r--r--content/plugin/webplugin_proxy.h1
-rw-r--r--content/renderer/pepper/video_encoder_shim.cc1
-rw-r--r--content/renderer/render_view_browsertest.cc2
-rw-r--r--extensions/browser/extension_user_script_loader.h1
-rw-r--r--extensions/renderer/script_injection_manager.h1
-rw-r--r--gpu/command_buffer/service/command_buffer_service.h1
-rw-r--r--gpu/command_buffer/service/transfer_buffer_manager.h1
-rw-r--r--ppapi/proxy/ppb_graphics_3d_proxy.h3
-rw-r--r--ppapi/proxy/serialized_var.h1
-rw-r--r--third_party/leveldatabase/env_chromium.cc1
-rw-r--r--ui/base/clipboard/clipboard.h1
-rw-r--r--ui/base/clipboard/clipboard_win.cc1
23 files changed, 6 insertions, 33 deletions
diff --git a/cc/resources/video_resource_updater_unittest.cc b/cc/resources/video_resource_updater_unittest.cc
index 6a4c441..3d4bf17 100644
--- a/cc/resources/video_resource_updater_unittest.cc
+++ b/cc/resources/video_resource_updater_unittest.cc
@@ -4,7 +4,6 @@
#include "cc/resources/video_resource_updater.h"
-#include "base/memory/shared_memory.h"
#include "cc/resources/resource_provider.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/fake_output_surface_client.h"
diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
index af2c387..caa266e 100644
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -9,7 +9,6 @@
#include "base/files/file_util.h"
#include "base/format_macros.h"
#include "base/json/json_writer.h"
-#include "base/memory/shared_memory.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/chrome/common/media/webrtc_logging_messages.h b/chrome/common/media/webrtc_logging_messages.h
index 30ed397..cfb2230 100644
--- a/chrome/common/media/webrtc_logging_messages.h
+++ b/chrome/common/media/webrtc_logging_messages.h
@@ -5,7 +5,6 @@
// IPC messages for WebRTC logging.
// Multiply-included message file, hence no include guard.
-#include "base/memory/shared_memory.h"
#include "chrome/common/media/webrtc_logging_message_data.h"
#include "ipc/ipc_message_macros.h"
diff --git a/chrome/renderer/media/chrome_webrtc_log_message_delegate.h b/chrome/renderer/media/chrome_webrtc_log_message_delegate.h
index 5e31a48..374bff7 100644
--- a/chrome/renderer/media/chrome_webrtc_log_message_delegate.h
+++ b/chrome/renderer/media/chrome_webrtc_log_message_delegate.h
@@ -7,7 +7,6 @@
#include <string>
-#include "base/memory/shared_memory.h"
#include "chrome/common/media/webrtc_logging_message_data.h"
#include "content/public/renderer/webrtc_log_message_delegate.h"
#include "ipc/ipc_channel_proxy.h"
diff --git a/chrome/test/base/chrome_unit_test_suite.cc b/chrome/test/base/chrome_unit_test_suite.cc
index 08eb2b7..5285685 100644
--- a/chrome/test/base/chrome_unit_test_suite.cc
+++ b/chrome/test/base/chrome_unit_test_suite.cc
@@ -32,10 +32,6 @@
#include "ui/gl/test/gl_surface_test_support.h"
#endif
-#if defined(OS_POSIX)
-#include "base/memory/shared_memory.h"
-#endif
-
#if defined(ENABLE_EXTENSIONS)
#include "chrome/common/extensions/chrome_extensions_client.h"
#include "extensions/common/extension_paths.h"
diff --git a/components/nacl/loader/nacl_ipc_adapter.h b/components/nacl/loader/nacl_ipc_adapter.h
index c27d779..46d9e61 100644
--- a/components/nacl/loader/nacl_ipc_adapter.h
+++ b/components/nacl/loader/nacl_ipc_adapter.h
@@ -15,7 +15,6 @@
#include "base/files/scoped_file.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/shared_memory.h"
#include "base/pickle.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index 262e6a8..5503788 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -34,7 +34,6 @@
#include "base/android/jni_android.h"
#include "content/browser/android/child_process_launcher_android.h"
#elif defined(OS_POSIX)
-#include "base/memory/shared_memory.h"
#include "base/memory/singleton.h"
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
#include "content/browser/zygote_host/zygote_host_impl_linux.h"
@@ -92,7 +91,7 @@ void OnChildProcessStartedAndroid(const NotifyCallback& callback,
} else {
BrowserThread::PostTask(
client_thread_id, FROM_HERE, callback_on_client_thread);
- }
+ }
}
#endif
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index 64e8fa6..c923758 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -31,7 +31,6 @@
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/shared_memory.h"
#include "base/memory/weak_ptr.h"
#include "base/process/process.h"
#include "base/sequenced_task_runner_helpers.h"
@@ -58,7 +57,6 @@ class CONTENT_EXPORT AudioInputRendererHost
: public BrowserMessageFilter,
public media::AudioInputController::EventHandler {
public:
-
// Error codes to make native loggin more clear. These error codes are added
// to generic error strings to provide a higher degree of details.
// Changing these values can lead to problems when matching native debug
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 8b5074d..3938338 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -7,7 +7,6 @@
#include "base/command_line.h"
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/shared_memory.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/timer/timer.h"
@@ -199,6 +198,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
bool new_content_rendering_timeout_fired_;
WebInputEvent::Type acked_touch_event_type_;
+ private:
DISALLOW_COPY_AND_ASSIGN(MockRenderWidgetHost);
};
@@ -215,7 +215,7 @@ class RenderWidgetHostProcess : public MockRenderProcessHost {
bool HasConnection() const override { return true; }
- protected:
+ private:
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostProcess);
};
@@ -319,6 +319,7 @@ class TestView : public TestRenderWidgetHostView {
InputEventAckState ack_result_;
blink::WebScreenInfo screen_info_;
+ private:
DISALLOW_COPY_AND_ASSIGN(TestView);
};
diff --git a/content/common/pepper_file_util.h b/content/common/pepper_file_util.h
index 8c47440..25a586d 100644
--- a/content/common/pepper_file_util.h
+++ b/content/common/pepper_file_util.h
@@ -6,7 +6,6 @@
#define CONTENT_COMMON_PEPPER_FILE_UTIL_H_
#include "base/files/file.h"
-#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
#include "ppapi/c/pp_file_info.h"
#include "storage/common/fileapi/file_system_types.h"
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 6b6d696..dbfb39e 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -8,8 +8,6 @@
#include "base/bind.h"
#include "base/lazy_instance.h"
-#include "base/memory/shared_memory.h"
-#include "build/build_config.h"
#include "content/child/npapi/npobject_proxy.h"
#include "content/child/npapi/npobject_util.h"
#include "content/child/npapi/webplugin_delegate_impl.h"
@@ -280,7 +278,7 @@ void WebPluginProxy::HandleURLRequest(const char* url,
int notify_id,
bool popups_allowed,
bool notify_redirects) {
- if (!target && base::EqualsCaseInsensitiveASCII(method, "GET")) {
+ if (!target && base::EqualsCaseInsensitiveASCII(method, "GET")) {
// Please refer to https://bugzilla.mozilla.org/show_bug.cgi?id=366082
// for more details on this.
if (delegate_->GetQuirks() &
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index 2a561ed..7e54434 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -10,7 +10,6 @@
#include "base/containers/hash_tables.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/shared_memory.h"
#include "base/memory/weak_ptr.h"
#include "content/child/npapi/webplugin.h"
#include "ipc/ipc_message.h"
diff --git a/content/renderer/pepper/video_encoder_shim.cc b/content/renderer/pepper/video_encoder_shim.cc
index 1942a21..94c4ee7 100644
--- a/content/renderer/pepper/video_encoder_shim.cc
+++ b/content/renderer/pepper/video_encoder_shim.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"
-#include "base/memory/shared_memory.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "content/renderer/pepper/pepper_video_encoder_host.h"
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 7e75e8d..ca1b01f 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/location.h"
-#include "base/memory/shared_memory.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -1765,7 +1764,6 @@ TEST_F(RenderViewImplTest, TestBackForward) {
#if defined(OS_MACOSX) || defined(USE_AURA)
TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
-
#if defined(OS_WIN)
// http://crbug.com/304193
if (base::win::GetVersion() < base::win::VERSION_VISTA)
diff --git a/extensions/browser/extension_user_script_loader.h b/extensions/browser/extension_user_script_loader.h
index d18c4e4..bdd83a4 100644
--- a/extensions/browser/extension_user_script_loader.h
+++ b/extensions/browser/extension_user_script_loader.h
@@ -5,7 +5,6 @@
#ifndef EXTENSIONS_BROWSER_EXTENSION_USER_SCRIPT_LOADER_H_
#define EXTENSIONS_BROWSER_EXTENSION_USER_SCRIPT_LOADER_H_
-#include "base/memory/shared_memory.h"
#include "extensions/browser/extension_registry_observer.h"
#include "extensions/browser/user_script_loader.h"
#include "extensions/common/extension.h"
diff --git a/extensions/renderer/script_injection_manager.h b/extensions/renderer/script_injection_manager.h
index 5eda418..7d79f1c 100644
--- a/extensions/renderer/script_injection_manager.h
+++ b/extensions/renderer/script_injection_manager.h
@@ -11,7 +11,6 @@
#include "base/callback.h"
#include "base/memory/scoped_vector.h"
-#include "base/memory/shared_memory.h"
#include "base/scoped_observer.h"
#include "extensions/common/user_script.h"
#include "extensions/renderer/script_injection.h"
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index 809891b..ddcfec3 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -6,7 +6,6 @@
#define GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_
#include "base/callback.h"
-#include "base/memory/shared_memory.h"
#include "gpu/command_buffer/common/command_buffer.h"
#include "gpu/command_buffer/common/command_buffer_shared.h"
diff --git a/gpu/command_buffer/service/transfer_buffer_manager.h b/gpu/command_buffer/service/transfer_buffer_manager.h
index b89be15..a23f7c7 100644
--- a/gpu/command_buffer/service/transfer_buffer_manager.h
+++ b/gpu/command_buffer/service/transfer_buffer_manager.h
@@ -12,7 +12,6 @@
#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/shared_memory.h"
#include "base/trace_event/memory_dump_provider.h"
#include "gpu/command_buffer/common/command_buffer_shared.h"
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
index 98e7d3c..230cff3 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -7,7 +7,6 @@
#include <vector>
-#include "base/memory/shared_memory.h"
#include "gpu/command_buffer/common/command_buffer.h"
#include "ppapi/c/pp_graphics_3d.h"
#include "ppapi/c/pp_instance.h"
@@ -67,7 +66,7 @@ class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared {
class PPB_Graphics3D_Proxy : public InterfaceProxy {
public:
- PPB_Graphics3D_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Graphics3D_Proxy(Dispatcher* dispatcher);
~PPB_Graphics3D_Proxy();
static PP_Resource CreateProxyResource(
diff --git a/ppapi/proxy/serialized_var.h b/ppapi/proxy/serialized_var.h
index d83b7d3..46f8ed5 100644
--- a/ppapi/proxy/serialized_var.h
+++ b/ppapi/proxy/serialized_var.h
@@ -11,7 +11,6 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/shared_memory.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
index 6f2f844..939534c 100644
--- a/third_party/leveldatabase/env_chromium.cc
+++ b/third_party/leveldatabase/env_chromium.cc
@@ -11,7 +11,6 @@
#include "base/files/file_util.h"
#include "base/lazy_instance.h"
-#include "base/memory/shared_memory.h"
#include "base/metrics/histogram.h"
#include "base/process/process_metrics.h"
#include "base/stl_util.h"
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index 6c23a6d..af8f439 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "base/lazy_instance.h"
-#include "base/memory/shared_memory.h"
#include "base/process/process.h"
#include "base/strings/string16.h"
#include "base/synchronization/lock.h"
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index e818f22..2743755d 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -15,7 +15,6 @@
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/memory/shared_memory.h"
#include "base/message_loop/message_loop.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"