summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 00:43:30 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 00:43:30 +0000
commit83f93d3b7bf81c823c38a4d628b8486f354462cc (patch)
tree4efe00cb0a38503915aeaa6b396ec2c894e7cfad /content
parent67d3135ca4b8aacbcd5a2fdaa560920b0089c8ac (diff)
downloadchromium_src-83f93d3b7bf81c823c38a4d628b8486f354462cc.zip
chromium_src-83f93d3b7bf81c823c38a4d628b8486f354462cc.tar.gz
chromium_src-83f93d3b7bf81c823c38a4d628b8486f354462cc.tar.bz2
Cleanup: Remove more unneeded forward declares in content.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8511044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/common/child_process_host.h2
-rw-r--r--content/common/content_counters.h1
-rw-r--r--content/common/file_system/webfilewriter_impl.h2
-rw-r--r--content/common/gpu/gpu_channel.h8
-rw-r--r--content/common/npobject_util.h1
-rw-r--r--content/common/webblobregistry_impl.h13
-rw-r--r--content/gpu/gpu_child_thread.h4
-rw-r--r--content/public/renderer/render_view_observer.h1
-rw-r--r--content/renderer/devtools_agent.h1
-rw-r--r--content/renderer/devtools_client.h3
-rw-r--r--content/renderer/geolocation_dispatcher.h1
-rw-r--r--content/renderer/gpu/command_buffer_proxy.h10
-rw-r--r--content/renderer/gpu/gpu_channel_host.h3
-rw-r--r--content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h3
-rw-r--r--content/renderer/indexed_db_dispatcher.h2
-rw-r--r--content/renderer/media/audio_input_message_filter.h2
-rw-r--r--content/renderer/media/audio_message_filter.h2
-rw-r--r--content/renderer/p2p/p2p_transport_impl.h1
-rw-r--r--content/renderer/render_thread_impl.h15
-rw-r--r--content/renderer/render_view_impl.h24
-rw-r--r--content/renderer/render_widget.h2
-rw-r--r--content/renderer/renderer_webcookiejar_impl.h6
-rw-r--r--content/renderer/renderer_webidbdatabase_impl.h1
-rw-r--r--content/renderer/renderer_webidbfactory_impl.h2
-rw-r--r--content/renderer/renderer_webidbobjectstore_impl.h4
-rw-r--r--content/renderer/speech_input_dispatcher.h1
-rw-r--r--content/renderer/webplugin_delegate_proxy.h7
-rw-r--r--content/test/render_view_fake_resources_test.h1
-rw-r--r--content/test/render_view_test.h1
-rw-r--r--content/test/render_widget_browsertest.h5
-rw-r--r--content/test/webrtc_audio_device_test.h3
-rw-r--r--content/utility/utility_thread_impl.h4
-rw-r--r--content/worker/worker_thread.h3
33 files changed, 26 insertions, 113 deletions
diff --git a/content/common/child_process_host.h b/content/common/child_process_host.h
index 5570992..0c74fb93 100644
--- a/content/common/child_process_host.h
+++ b/content/common/child_process_host.h
@@ -24,7 +24,6 @@
#include "content/common/content_export.h"
#include "ipc/ipc_channel_proxy.h"
-class CommandLine;
class FilePath;
namespace IPC {
@@ -37,7 +36,6 @@ class Message;
class CONTENT_EXPORT ChildProcessHost : public IPC::Channel::Listener,
public IPC::Message::Sender {
public:
-
// These flags may be passed to GetChildPath in order to alter its behavior,
// causing it to return a child path more suited to a specific task.
enum {
diff --git a/content/common/content_counters.h b/content/common/content_counters.h
index 11ccee3..be8787b 100644
--- a/content/common/content_counters.h
+++ b/content/common/content_counters.h
@@ -13,7 +13,6 @@
namespace base {
class StatsCounter;
class StatsCounterTimer;
-class StatsRate;
}
namespace content {
diff --git a/content/common/file_system/webfilewriter_impl.h b/content/common/file_system/webfilewriter_impl.h
index 792926e..f5287f4 100644
--- a/content/common/file_system/webfilewriter_impl.h
+++ b/content/common/file_system/webfilewriter_impl.h
@@ -9,8 +9,6 @@
#include "base/memory/weak_ptr.h"
#include "webkit/fileapi/webfilewriter_base.h"
-class FileSystemDispatcher;
-
// An implementation of WebFileWriter for use in chrome renderers and workers.
class WebFileWriterImpl : public fileapi::WebFileWriterBase,
public base::SupportsWeakPtr<WebFileWriterImpl> {
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index 2594f48..8903b74 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -6,10 +6,8 @@
#define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
#pragma once
-#include <queue>
-#include <set>
+#include <deque>
#include <string>
-#include <vector>
#include "base/id_map.h"
#include "base/memory/ref_counted.h"
@@ -34,10 +32,6 @@ class MessageLoopProxy;
class WaitableEvent;
}
-namespace gfx {
-class GLSurface;
-}
-
// Encapsulates an IPC channel between the GPU process and one renderer
// process. On the renderer side there's a corresponding GpuChannelHost.
class GpuChannel : public IPC::Channel::Listener,
diff --git a/content/common/npobject_util.h b/content/common/npobject_util.h
index bc99397..aab6b62 100644
--- a/content/common/npobject_util.h
+++ b/content/common/npobject_util.h
@@ -17,7 +17,6 @@
#include "content/common/npobject_stub.h"
class GURL;
-class NPObjectProxy;
class NPChannelBase;
struct _NPVariant;
diff --git a/content/common/webblobregistry_impl.h b/content/common/webblobregistry_impl.h
index 6b05683..e7b64ae 100644
--- a/content/common/webblobregistry_impl.h
+++ b/content/common/webblobregistry_impl.h
@@ -1,20 +1,15 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_COMMON_WEBBLOBREGISTRY_IMPL_H_
-#define CHROME_COMMON_WEBBLOBREGISTRY_IMPL_H_
+#ifndef CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_
+#define CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_
#pragma once
-//#include "ipc/ipc_message.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
class ChildThread;
-namespace base {
-class SharedMemory;
-}
-
namespace WebKit {
class WebBlobData;
class WebURL;
@@ -36,4 +31,4 @@ class WebBlobRegistryImpl : public WebKit::WebBlobRegistry {
ChildThread* child_thread_;
};
-#endif // CHROME_COMMON_WEBBLOBREGISTRY_IMPL_H_
+#endif // CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index 5409963..3081239 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -22,10 +22,6 @@
#include "content/public/common/gpu_info.h"
#include "ui/gfx/native_widget_types.h"
-namespace IPC {
-struct ChannelHandle;
-}
-
namespace sandbox {
class TargetServices;
}
diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h
index a3d05cc..9e81c2d 100644
--- a/content/public/renderer/render_view_observer.h
+++ b/content/public/renderer/render_view_observer.h
@@ -18,7 +18,6 @@ class WebFormElement;
class WebMediaPlayerClient;
class WebMouseEvent;
class WebNode;
-class WebString;
class WebTouchEvent;
class WebURL;
struct WebURLError;
diff --git a/content/renderer/devtools_agent.h b/content/renderer/devtools_agent.h
index 85e8f48..e8c4bbe 100644
--- a/content/renderer/devtools_agent.h
+++ b/content/renderer/devtools_agent.h
@@ -13,7 +13,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h"
class RenderViewImpl;
-struct DevToolsMessageData;
namespace WebKit {
class WebDevToolsAgent;
diff --git a/content/renderer/devtools_client.h b/content/renderer/devtools_client.h
index e88851e..0e1f1508 100644
--- a/content/renderer/devtools_client.h
+++ b/content/renderer/devtools_client.h
@@ -13,7 +13,6 @@
#include "content/public/renderer/render_view_observer.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h"
-class MessageLoop;
class RenderViewImpl;
namespace WebKit {
@@ -21,8 +20,6 @@ class WebDevToolsFrontend;
class WebString;
}
-struct DevToolsMessageData;
-
// Developer tools UI end of communication channel between the render process of
// the page being inspected and tools UI renderer process. All messages will
// go through browser process. On the side of the inspected page there's
diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h
index 10e06de9..2c50db6 100644
--- a/content/renderer/geolocation_dispatcher.h
+++ b/content/renderer/geolocation_dispatcher.h
@@ -19,7 +19,6 @@ class WebGeolocationController;
class WebGeolocationPermissionRequest;
class WebGeolocationPermissionRequestManager;
class WebGeolocationPosition;
-class WebSecurityOrigin;
}
// GeolocationDispatcher is a delegate for Geolocation messages used by
diff --git a/content/renderer/gpu/command_buffer_proxy.h b/content/renderer/gpu/command_buffer_proxy.h
index a65f882..e86988a 100644
--- a/content/renderer/gpu/command_buffer_proxy.h
+++ b/content/renderer/gpu/command_buffer_proxy.h
@@ -21,17 +21,12 @@
#include "ipc/ipc_channel.h"
#include "ipc/ipc_message.h"
+class GpuChannelHost;
+
namespace base {
class SharedMemory;
}
-namespace gfx {
-class Size;
-}
-
-class GpuChannelHost;
-class PluginChannelHost;
-
// Client side proxy that forwards messages synchronously to a
// CommandBufferStub.
class CommandBufferProxy : public gpu::CommandBuffer,
@@ -97,7 +92,6 @@ class CommandBufferProxy : public gpu::CommandBuffer,
media::VideoDecodeAccelerator::Client* client);
private:
-
// Send an IPC message over the GPU channel. This is private to fully
// encapsulate the channel; all callers of this function must explicitly
// verify that the context has not been lost.
diff --git a/content/renderer/gpu/gpu_channel_host.h b/content/renderer/gpu/gpu_channel_host.h
index f4a8e19..0319dac 100644
--- a/content/renderer/gpu/gpu_channel_host.h
+++ b/content/renderer/gpu/gpu_channel_host.h
@@ -26,7 +26,6 @@
#include "ui/gfx/size.h"
class CommandBufferProxy;
-class GpuSurfaceProxy;
class GURL;
class TransportTextureService;
@@ -150,7 +149,7 @@ class GpuChannelHost : public IPC::Message::Sender,
// to the correct message loop.
class MessageFilter : public IPC::ChannelProxy::MessageFilter {
public:
- MessageFilter(GpuChannelHost* parent);
+ explicit MessageFilter(GpuChannelHost* parent);
virtual ~MessageFilter();
void AddRoute(int route_id,
diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
index 01bf479..adc8f69 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
@@ -8,6 +8,7 @@
#if defined(ENABLE_GPU)
+#include <string>
#include <vector>
#include "base/memory/scoped_ptr.h"
@@ -25,7 +26,6 @@
#endif
class GpuChannelHost;
-class CommandBufferProxy;
namespace gpu {
namespace gles2 {
@@ -50,7 +50,6 @@ using WebKit::WGC3Dsizeiptr;
class WebGraphicsContext3DCommandBufferImpl
: public WebKit::WebGraphicsContext3D {
public:
-
WebGraphicsContext3DCommandBufferImpl();
virtual ~WebGraphicsContext3DCommandBufferImpl();
diff --git a/content/renderer/indexed_db_dispatcher.h b/content/renderer/indexed_db_dispatcher.h
index d779454..43c8443 100644
--- a/content/renderer/indexed_db_dispatcher.h
+++ b/content/renderer/indexed_db_dispatcher.h
@@ -7,6 +7,7 @@
#pragma once
#include <map>
+#include <vector>
#include "base/id_map.h"
#include "base/nullable_string16.h"
@@ -21,7 +22,6 @@ class IndexedDBKey;
class RendererWebIDBCursorImpl;
namespace WebKit {
-class WebDOMStringList;
class WebFrame;
class WebIDBKeyRange;
class WebIDBTransaction;
diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h
index 74ba3c0..89fdd54 100644
--- a/content/renderer/media/audio_input_message_filter.h
+++ b/content/renderer/media/audio_input_message_filter.h
@@ -20,8 +20,6 @@
#include "ipc/ipc_channel_proxy.h"
#include "media/audio/audio_buffers_state.h"
-class MessageLoop;
-
class AudioInputMessageFilter : public IPC::ChannelProxy::MessageFilter {
public:
class Delegate {
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index 0f98cfa..b37e45e 100644
--- a/content/renderer/media/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -20,8 +20,6 @@
#include "ipc/ipc_channel_proxy.h"
#include "media/audio/audio_buffers_state.h"
-class MessageLoop;
-
namespace base {
class Time;
}
diff --git a/content/renderer/p2p/p2p_transport_impl.h b/content/renderer/p2p/p2p_transport_impl.h
index b807e44..a22a991 100644
--- a/content/renderer/p2p/p2p_transport_impl.h
+++ b/content/renderer/p2p/p2p_transport_impl.h
@@ -35,7 +35,6 @@ class PacketSocketFactory;
namespace content {
-class P2PPortAllocator;
class P2PSocketDispatcher;
class CONTENT_EXPORT P2PTransportImpl
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 47181d2..32e92df 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -28,26 +28,15 @@ class AudioMessageFilter;
class CompositorThread;
class DBMessageFilter;
class DevToolsAgentFilter;
-class FilePath;
+struct DOMStorageMsg_Event_Params;
class GpuChannelHost;
class IndexedDBDispatcher;
class RendererHistogram;
-class RendererHistogramSnapshots;
-class RendererNetPredictor;
class RendererWebKitPlatformSupportImpl;
class SkBitmap;
class VideoCaptureImplManager;
-class WebDatabaseObserverImpl;
-
-struct RendererPreferences;
-struct DOMStorageMsg_Event_Params;
-struct GPUInfo;
struct ViewMsg_New_Params;
-struct WebPreferences;
-
-namespace IPC {
-struct ChannelHandle;
-}
+class WebDatabaseObserverImpl;
namespace WebKit {
class WebStorageEventDispatcher;
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 3f23318..f8d742a 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -54,7 +54,6 @@
#pragma warning(disable: 4250)
#endif
-class AudioMessageFilter;
class DeviceOrientationDispatcher;
class DevToolsAgent;
class ExternalPopupMenu;
@@ -66,31 +65,24 @@ class LoadProgressTracker;
class MediaStreamImpl;
class NotificationProvider;
class PepperDeviceTest;
-class PrintWebViewHelper;
+struct PP_NetAddress_Private;
class RenderWidgetFullscreenPepper;
class RendererAccessibility;
class SkBitmap;
class SpeechInputDispatcher;
-class WebPluginDelegateProxy;
-class WebUIBindings;
-struct ContextMenuMediaParams;
-struct PP_NetAddress_Private;
struct ViewHostMsg_RunFileChooser_Params;
-struct ViewMsg_SwapOut_Params;
struct ViewMsg_Navigate_Params;
struct ViewMsg_StopFinding_Params;
+struct ViewMsg_SwapOut_Params;
struct WebDropData;
-
-namespace base {
-class WaitableEvent;
-} // namespace base
+class WebPluginDelegateProxy;
+class WebUIBindings;
namespace content {
class RenderViewTest;
class NavigationState;
class P2PSocketDispatcher;
class RenderViewObserver;
-class RenderViewVisitor;
} // namespace content
namespace gfx {
@@ -102,7 +94,6 @@ namespace webkit {
namespace ppapi {
class PluginInstance;
-class PluginModule;
} // namespace ppapi
} // namespace webkit
@@ -110,9 +101,6 @@ class PluginModule;
namespace webkit_glue {
struct CustomContextMenuContext;
class ImageResourceFetcher;
-struct FileUploadData;
-struct FormData;
-struct PasswordFormFillData;
class ResourceFetcher;
}
@@ -120,14 +108,10 @@ namespace WebKit {
class WebApplicationCacheHost;
class WebApplicationCacheHostClient;
class WebDataSource;
-class WebDocument;
class WebDragData;
class WebGeolocationClient;
-class WebGeolocationServiceInterface;
class WebIconURL;
class WebImage;
-class WebInputElement;
-class WebKeyboardEvent;
class WebMediaPlayer;
class WebMediaPlayerClient;
class WebMouseEvent;
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 4c0b252..93246a1 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -34,11 +34,9 @@ class SyncMessage;
}
namespace WebKit {
-class WebInputEvent;
class WebMouseEvent;
class WebTouchEvent;
class WebWidget;
-struct WebPopupMenuInfo;
}
namespace gfx {
diff --git a/content/renderer/renderer_webcookiejar_impl.h b/content/renderer/renderer_webcookiejar_impl.h
index e390ea6..eb0f4f1 100644
--- a/content/renderer/renderer_webcookiejar_impl.h
+++ b/content/renderer/renderer_webcookiejar_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,10 +10,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCookieJar.h"
-namespace IPC {
-class SyncMessage;
-}
-
class RenderViewImpl;
class RendererWebCookieJarImpl : public WebKit::WebCookieJar {
diff --git a/content/renderer/renderer_webidbdatabase_impl.h b/content/renderer/renderer_webidbdatabase_impl.h
index 524f05d..95d47a0 100644
--- a/content/renderer/renderer_webidbdatabase_impl.h
+++ b/content/renderer/renderer_webidbdatabase_impl.h
@@ -10,7 +10,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h"
namespace WebKit {
-class WebFrame;
class WebIDBCallbacks;
class WebIDBDatabaseCallbacks;
class WebString;
diff --git a/content/renderer/renderer_webidbfactory_impl.h b/content/renderer/renderer_webidbfactory_impl.h
index d2dc174..a26d1ba 100644
--- a/content/renderer/renderer_webidbfactory_impl.h
+++ b/content/renderer/renderer_webidbfactory_impl.h
@@ -11,9 +11,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
namespace WebKit {
-class WebDOMStringList;
class WebFrame;
-class WebIDBDatabase;
class WebSecurityOrigin;
class WebString;
}
diff --git a/content/renderer/renderer_webidbobjectstore_impl.h b/content/renderer/renderer_webidbobjectstore_impl.h
index 6467960..c95e5bf 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.h
+++ b/content/renderer/renderer_webidbobjectstore_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,7 +11,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
namespace WebKit {
-class WebFrame;
class WebIDBCallbacks;
class WebIDBIndex;
class WebIDBKey;
@@ -65,6 +64,7 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
WebKit::WebIDBCallbacks* callbacks,
const WebKit::WebIDBTransaction& transaction,
WebKit::WebExceptionCode& ec);
+
private:
int32 idb_object_store_id_;
};
diff --git a/content/renderer/speech_input_dispatcher.h b/content/renderer/speech_input_dispatcher.h
index c95d99e..5d9d14c 100644
--- a/content/renderer/speech_input_dispatcher.h
+++ b/content/renderer/speech_input_dispatcher.h
@@ -10,7 +10,6 @@
#include "content/public/renderer/render_view_observer.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputController.h"
-class GURL;
class RenderViewImpl;
namespace WebKit {
diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h
index 02a87e6..9e9914b 100644
--- a/content/renderer/webplugin_delegate_proxy.h
+++ b/content/renderer/webplugin_delegate_proxy.h
@@ -26,17 +26,14 @@
#include "base/memory/linked_ptr.h"
#endif
+struct NPObject;
class NPObjectStub;
class PluginChannelHost;
+struct PluginHostMsg_URLRequest_Params;
class RenderViewImpl;
class SkBitmap;
-struct NPObject;
-struct NPVariant_Param;
-struct PluginHostMsg_URLRequest_Params;
-
namespace base {
-class SharedMemory;
class WaitableEvent;
}
diff --git a/content/test/render_view_fake_resources_test.h b/content/test/render_view_fake_resources_test.h
index 272170c..e9d4e6a 100644
--- a/content/test/render_view_fake_resources_test.h
+++ b/content/test/render_view_fake_resources_test.h
@@ -53,7 +53,6 @@
#include "testing/gtest/include/gtest/gtest.h"
class MockRenderProcess;
-class RendererMainPlatformDelegate;
class RenderThreadImpl;
class RenderView;
struct ResourceHostMsg_Request;
diff --git a/content/test/render_view_test.h b/content/test/render_view_test.h
index 6463602..6710389 100644
--- a/content/test/render_view_test.h
+++ b/content/test/render_view_test.h
@@ -22,7 +22,6 @@
class MockRenderProcess;
class RendererMainPlatformDelegate;
-struct ViewMsg_Navigate_Params;
namespace WebKit {
class WebWidget;
diff --git a/content/test/render_widget_browsertest.h b/content/test/render_widget_browsertest.h
index f0d1c53..cb06a28 100644
--- a/content/test/render_widget_browsertest.h
+++ b/content/test/render_widget_browsertest.h
@@ -10,13 +10,12 @@
#include "base/file_path.h"
#include "content/test/render_view_test.h"
+class SkBitmap;
+
namespace gfx {
class Size;
}
-class SkBitmap;
-class TransportDIB;
-
class RenderWidgetTest : public content::RenderViewTest {
public:
RenderWidgetTest();
diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h
index 0c3779c..14df695 100644
--- a/content/test/webrtc_audio_device_test.h
+++ b/content/test/webrtc_audio_device_test.h
@@ -8,6 +8,8 @@
#include <string>
+#include <string>
+
#include "base/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -18,7 +20,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/common_types.h"
-class AudioInputRendererHost;
class AudioRendererHost;
class RenderThreadImpl;
class WebRTCMockRenderProcess;
diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h
index ab468c4..6facec1 100644
--- a/content/utility/utility_thread_impl.h
+++ b/content/utility/utility_thread_impl.h
@@ -23,10 +23,6 @@ namespace content {
class SerializedScriptValue;
}
-namespace webkit {
-struct WebPluginInfo;
-}
-
namespace webkit_glue {
class WebKitPlatformSupportImpl;
}
diff --git a/content/worker/worker_thread.h b/content/worker/worker_thread.h
index a552c9a..89d8f85 100644
--- a/content/worker/worker_thread.h
+++ b/content/worker/worker_thread.h
@@ -10,13 +10,12 @@
#include "content/common/child_thread.h"
-class GURL;
class AppCacheDispatcher;
class DBMessageFilter;
class WebDatabaseObserverImpl;
class WebSharedWorkerStub;
-class WorkerWebKitPlatformSupportImpl;
struct WorkerProcessMsg_CreateWorker_Params;
+class WorkerWebKitPlatformSupportImpl;
class WorkerThread : public ChildThread {
public: