Move a bunch of html5 renderer code to content.
TBR=avi
Review URL: http://codereview.chromium.org/6703003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78449 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 988ae26..7f101f4a 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -82,16 +82,8 @@
'renderer/resources/renderer_extension_bindings.js',
'renderer/about_handler.cc',
'renderer/about_handler.h',
- 'renderer/audio_device.cc',
- 'renderer/audio_device.h',
- 'renderer/audio_message_filter.cc',
- 'renderer/audio_message_filter.h',
'renderer/blocked_plugin.cc',
'renderer/blocked_plugin.h',
- 'renderer/cookie_message_filter.cc',
- 'renderer/cookie_message_filter.h',
- 'renderer/device_orientation_dispatcher.cc',
- 'renderer/device_orientation_dispatcher.h',
'renderer/devtools_agent.cc',
'renderer/devtools_agent.h',
'renderer/devtools_agent_filter.cc',
@@ -103,24 +95,18 @@
'renderer/external_host_bindings.h',
'renderer/external_extension.cc',
'renderer/external_extension.h',
- 'renderer/geolocation_dispatcher.cc',
- 'renderer/geolocation_dispatcher.h',
'renderer/gpu_channel_host.cc',
'renderer/gpu_channel_host.h',
'renderer/gpu_video_decoder_host.cc',
'renderer/gpu_video_decoder_host.h',
'renderer/gpu_video_service_host.cc',
'renderer/gpu_video_service_host.h',
- 'renderer/indexed_db_dispatcher.cc',
- 'renderer/indexed_db_dispatcher.h',
'renderer/localized_error.cc',
'renderer/localized_error.h',
'renderer/load_progress_tracker.cc',
'renderer/load_progress_tracker.h',
'renderer/navigation_state.cc',
'renderer/navigation_state.h',
- 'renderer/notification_provider.cc',
- 'renderer/notification_provider.h',
'renderer/paint_aggregator.cc',
'renderer/page_click_listener.h',
'renderer/page_click_tracker.cc',
@@ -219,8 +205,6 @@
'renderer/searchbox_extension.h',
'renderer/security_filter_peer.cc',
'renderer/security_filter_peer.h',
- 'renderer/speech_input_dispatcher.cc',
- 'renderer/speech_input_dispatcher.h',
'renderer/spellchecker/spellcheck_provider.cc',
'renderer/spellchecker/spellcheck_provider.h',
'renderer/spellchecker/spellcheck.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e18115ede..14964c1a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1752,7 +1752,6 @@
'common/web_apps_unittest.cc',
'common/worker_thread_ticker_unittest.cc',
'common/zip_unittest.cc',
- 'renderer/audio_message_filter_unittest.cc',
'renderer/extensions/extension_api_json_validity_unittest.cc',
'renderer/extensions/json_schema_unittest.cc',
'renderer/gpu_video_decoder_host_unittest.cc',
@@ -1840,6 +1839,7 @@
'../content/gpu/gpu_info_collector_unittest.cc',
'../content/gpu/gpu_info_unittest_win.cc',
'../content/gpu/gpu_video_decoder_unittest.cc',
+ '../content/renderer/audio_message_filter_unittest.cc',
'../content/renderer/media/audio_renderer_impl_unittest.cc',
'../testing/gtest_mac_unittest.mm',
'../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index b9547f1..e0fd67a434 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -18,7 +18,6 @@
#include "chrome/common/pepper_plugin_registry.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/render_messages_params.h"
-#include "chrome/renderer/audio_message_filter.h"
#include "chrome/renderer/command_buffer_proxy.h"
#include "chrome/renderer/gpu_channel_host.h"
#include "chrome/renderer/pepper_platform_context_3d_impl.h"
@@ -31,6 +30,7 @@
#include "content/common/file_system/file_system_dispatcher.h"
#include "content/common/pepper_file_messages.h"
#include "content/common/pepper_messages.h"
+#include "content/renderer/audio_message_filter.h"
#include "content/renderer/ggl.h"
#include "grit/locale_settings.h"
#include "ipc/ipc_channel_handle.h"
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index c9ddbcfc..be21b01 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -32,7 +32,6 @@
#include "chrome/common/renderer_preferences.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/automation/dom_automation_v8_extension.h"
-#include "chrome/renderer/cookie_message_filter.h"
#include "chrome/renderer/devtools_agent_filter.h"
#include "chrome/renderer/extension_groups.h"
#include "chrome/renderer/extensions/chrome_app_bindings.h"
@@ -43,7 +42,6 @@
#include "chrome/renderer/external_extension.h"
#include "chrome/renderer/gpu_channel_host.h"
#include "chrome/renderer/gpu_video_service_host.h"
-#include "chrome/renderer/indexed_db_dispatcher.h"
#include "chrome/renderer/loadtimes_extension_bindings.h"
#include "chrome/renderer/net/renderer_net_predictor.h"
#include "chrome/renderer/plugin_channel_host.h"
@@ -69,6 +67,8 @@
#include "content/common/resource_messages.h"
#include "content/common/web_database_observer_impl.h"
#include "content/plugin/npobject_util.h"
+#include "content/renderer/cookie_message_filter.h"
+#include "content/renderer/indexed_db_dispatcher.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_platform_file.h"
#include "net/base/net_errors.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index ec6cc55e..9452660e 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -44,13 +44,11 @@
#include "chrome/common/web_apps.h"
#include "chrome/common/window_container_type.h"
#include "chrome/renderer/about_handler.h"
-#include "chrome/renderer/audio_message_filter.h"
#include "chrome/renderer/autofill/autofill_agent.h"
#include "chrome/renderer/autofill/form_manager.h"
#include "chrome/renderer/autofill/password_autofill_manager.h"
#include "chrome/renderer/automation/dom_automation_controller.h"
#include "chrome/renderer/blocked_plugin.h"
-#include "chrome/renderer/device_orientation_dispatcher.h"
#include "chrome/renderer/devtools_agent.h"
#include "chrome/renderer/devtools_client.h"
#include "chrome/renderer/extension_groups.h"
@@ -61,11 +59,9 @@
#include "chrome/renderer/extensions/renderer_extension_bindings.h"
#include "chrome/renderer/external_host_bindings.h"
#include "chrome/renderer/external_popup_menu.h"
-#include "chrome/renderer/geolocation_dispatcher.h"
#include "chrome/renderer/load_progress_tracker.h"
#include "chrome/renderer/localized_error.h"
#include "chrome/renderer/navigation_state.h"
-#include "chrome/renderer/notification_provider.h"
#include "chrome/renderer/page_click_tracker.h"
#include "chrome/renderer/page_load_histograms.h"
#include "chrome/renderer/plugin_channel_host.h"
@@ -81,7 +77,6 @@
#include "chrome/renderer/safe_browsing/malware_dom_details.h"
#include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
#include "chrome/renderer/searchbox.h"
-#include "chrome/renderer/speech_input_dispatcher.h"
#include "chrome/renderer/spellchecker/spellcheck.h"
#include "chrome/renderer/spellchecker/spellcheck_provider.h"
#include "chrome/renderer/translate_helper.h"
@@ -101,10 +96,15 @@
#include "content/common/file_system/webfilesystem_callback_dispatcher.h"
#include "content/common/notification_service.h"
#include "content/common/pepper_messages.h"
+#include "content/renderer/audio_message_filter.h"
+#include "content/renderer/device_orientation_dispatcher.h"
+#include "content/renderer/geolocation_dispatcher.h"
#include "content/renderer/ggl.h"
#include "content/renderer/media/audio_renderer_impl.h"
#include "content/renderer/media/ipc_video_decoder.h"
+#include "content/renderer/notification_provider.h"
#include "content/renderer/p2p/socket_dispatcher.h"
+#include "content/renderer/speech_input_dispatcher.h"
#include "grit/generated_resources.h"
#include "grit/renderer_resources.h"
#include "media/base/filter_collection.h"
diff --git a/chrome/renderer/renderer_webaudiodevice_impl.h b/chrome/renderer/renderer_webaudiodevice_impl.h
index 92954aa..7222720 100644
--- a/chrome/renderer/renderer_webaudiodevice_impl.h
+++ b/chrome/renderer/renderer_webaudiodevice_impl.h
@@ -8,7 +8,7 @@
#include <vector>
#include "base/scoped_ptr.h"
-#include "chrome/renderer/audio_device.h"
+#include "content/renderer/audio_device.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioDevice.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
diff --git a/chrome/renderer/renderer_webidbcursor_impl.cc b/chrome/renderer/renderer_webidbcursor_impl.cc
index d0aa1be..8234c02 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.cc
+++ b/chrome/renderer/renderer_webidbcursor_impl.cc
@@ -4,9 +4,9 @@
#include "chrome/renderer/renderer_webidbcursor_impl.h"
-#include "chrome/renderer/indexed_db_dispatcher.h"
#include "chrome/renderer/render_thread.h"
#include "content/common/indexed_db_messages.h"
+#include "content/renderer/indexed_db_dispatcher.h"
using WebKit::WebExceptionCode;
using WebKit::WebIDBCallbacks;
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.cc b/chrome/renderer/renderer_webidbdatabase_impl.cc
index 159fe07f..5cea597 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.cc
+++ b/chrome/renderer/renderer_webidbdatabase_impl.cc
@@ -5,10 +5,10 @@
#include "chrome/renderer/renderer_webidbdatabase_impl.h"
#include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/indexed_db_dispatcher.h"
#include "chrome/renderer/renderer_webidbobjectstore_impl.h"
#include "chrome/renderer/renderer_webidbtransaction_impl.h"
#include "content/common/indexed_db_messages.h"
+#include "content/renderer/indexed_db_dispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
diff --git a/chrome/renderer/renderer_webidbfactory_impl.cc b/chrome/renderer/renderer_webidbfactory_impl.cc
index 66914d9..e103673 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.cc
+++ b/chrome/renderer/renderer_webidbfactory_impl.cc
@@ -6,7 +6,7 @@
#include "chrome/common/render_messages.h"
#include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/indexed_db_dispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/renderer/renderer_webidbindex_impl.cc b/chrome/renderer/renderer_webidbindex_impl.cc
index d67fe38..c88dcb0 100644
--- a/chrome/renderer/renderer_webidbindex_impl.cc
+++ b/chrome/renderer/renderer_webidbindex_impl.cc
@@ -5,9 +5,9 @@
#include "chrome/renderer/renderer_webidbindex_impl.h"
#include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/indexed_db_dispatcher.h"
#include "chrome/renderer/renderer_webidbtransaction_impl.h"
#include "content/common/indexed_db_messages.h"
+#include "content/renderer/indexed_db_dispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/chrome/renderer/renderer_webidbobjectstore_impl.cc
index 99bce34..aa4106c 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.cc
@@ -4,12 +4,12 @@
#include "chrome/renderer/renderer_webidbobjectstore_impl.h"
-#include "chrome/renderer/indexed_db_dispatcher.h"
#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/renderer_webidbindex_impl.h"
#include "chrome/renderer/renderer_webidbtransaction_impl.h"
#include "content/common/indexed_db_messages.h"
#include "content/common/serialized_script_value.h"
+#include "content/renderer/indexed_db_dispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.cc b/chrome/renderer/renderer_webidbtransaction_impl.cc
index b65f5a9c..b4bbbbf 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.cc
+++ b/chrome/renderer/renderer_webidbtransaction_impl.cc
@@ -4,10 +4,10 @@
#include "chrome/renderer/renderer_webidbtransaction_impl.h"
-#include "chrome/renderer/indexed_db_dispatcher.h"
#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/renderer_webidbobjectstore_impl.h"
#include "content/common/indexed_db_messages.h"
+#include "content/renderer/indexed_db_dispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index dfd5246..cfed384 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -18,14 +18,28 @@
'..',
],
'sources': [
+ 'renderer/audio_device.cc',
+ 'renderer/audio_device.h',
+ 'renderer/audio_message_filter.cc',
+ 'renderer/audio_message_filter.h',
+ 'renderer/cookie_message_filter.cc',
+ 'renderer/cookie_message_filter.h',
+ 'renderer/device_orientation_dispatcher.cc',
+ 'renderer/device_orientation_dispatcher.h',
+ 'renderer/geolocation_dispatcher.cc',
+ 'renderer/geolocation_dispatcher.h',
'renderer/ggl.cc',
'renderer/ggl.h',
+ 'renderer/indexed_db_dispatcher.cc',
+ 'renderer/indexed_db_dispatcher.h',
'renderer/media/audio_renderer_impl.cc',
'renderer/media/audio_renderer_impl.h',
'renderer/media/gles2_video_decode_context.cc',
'renderer/media/gles2_video_decode_context.h',
'renderer/media/ipc_video_decoder.cc',
'renderer/media/ipc_video_decoder.h',
+ 'renderer/notification_provider.cc',
+ 'renderer/notification_provider.h',
'renderer/p2p/ipc_network_manager.cc',
'renderer/p2p/ipc_network_manager.h',
'renderer/p2p/ipc_socket_factory.cc',
@@ -34,6 +48,8 @@
'renderer/p2p/socket_client.h',
'renderer/p2p/socket_dispatcher.cc',
'renderer/p2p/socket_dispatcher.h',
+ 'renderer/speech_input_dispatcher.cc',
+ 'renderer/speech_input_dispatcher.h',
],
},
],
diff --git a/chrome/renderer/audio_device.cc b/content/renderer/audio_device.cc
similarity index 98%
rename from chrome/renderer/audio_device.cc
rename to content/renderer/audio_device.cc
index f4ad51a..cf1dd7d4 100644
--- a/chrome/renderer/audio_device.cc
+++ b/content/renderer/audio_device.cc
@@ -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 "chrome/renderer/audio_device.h"
+#include "content/renderer/audio_device.h"
#include "base/singleton.h"
#include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/audio_device.h b/content/renderer/audio_device.h
similarity index 93%
rename from chrome/renderer/audio_device.h
rename to content/renderer/audio_device.h
index 551d3c92..9f152bf 100644
--- a/chrome/renderer/audio_device.h
+++ b/content/renderer/audio_device.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 CHROME_RENDERER_AUDIO_DEVICE_H_
-#define CHROME_RENDERER_AUDIO_DEVICE_H_
+#ifndef CONTENT_RENDERER_AUDIO_DEVICE_H_
+#define CONTENT_RENDERER_AUDIO_DEVICE_H_
#pragma once
#include <vector>
@@ -12,7 +12,7 @@
#include "base/scoped_ptr.h"
#include "base/shared_memory.h"
#include "base/threading/simple_thread.h"
-#include "chrome/renderer/audio_message_filter.h"
+#include "content/renderer/audio_message_filter.h"
// Each instance of AudioDevice corresponds to one host stream.
// This class is not thread-safe, so its methods must be called from
@@ -81,4 +81,4 @@
DISALLOW_COPY_AND_ASSIGN(AudioDevice);
};
-#endif // CHROME_RENDERER_AUDIO_DEVICE_H_
+#endif // CONTENT_RENDERER_AUDIO_DEVICE_H_
diff --git a/chrome/renderer/audio_message_filter.cc b/content/renderer/audio_message_filter.cc
similarity index 98%
rename from chrome/renderer/audio_message_filter.cc
rename to content/renderer/audio_message_filter.cc
index 8969b3b..317943c 100644
--- a/chrome/renderer/audio_message_filter.cc
+++ b/content/renderer/audio_message_filter.cc
@@ -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 "chrome/renderer/audio_message_filter.h"
+#include "content/renderer/audio_message_filter.h"
#include "base/message_loop.h"
#include "base/time.h"
diff --git a/chrome/renderer/audio_message_filter.h b/content/renderer/audio_message_filter.h
similarity index 96%
rename from chrome/renderer/audio_message_filter.h
rename to content/renderer/audio_message_filter.h
index 48cf90b6b..e362839 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/content/renderer/audio_message_filter.h
@@ -7,8 +7,8 @@
// IO thread (main thread of render process), it intercepts audio messages
// and process them on IO thread since these messages are time critical.
-#ifndef CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
-#define CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
+#ifndef CONTENT_RENDERER_AUDIO_MESSAGE_FILTER_H_
+#define CONTENT_RENDERER_AUDIO_MESSAGE_FILTER_H_
#pragma once
#include "base/gtest_prod_util.h"
@@ -118,4 +118,4 @@
DISALLOW_COPY_AND_ASSIGN(AudioMessageFilter);
};
-#endif // CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
+#endif // CONTENT_RENDERER_AUDIO_MESSAGE_FILTER_H_
diff --git a/chrome/renderer/audio_message_filter_unittest.cc b/content/renderer/audio_message_filter_unittest.cc
similarity index 98%
rename from chrome/renderer/audio_message_filter_unittest.cc
rename to content/renderer/audio_message_filter_unittest.cc
index 8c6b2710..bfd42ebe 100644
--- a/chrome/renderer/audio_message_filter_unittest.cc
+++ b/content/renderer/audio_message_filter_unittest.cc
@@ -5,7 +5,7 @@
#include "base/message_loop.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/render_messages_params.h"
-#include "chrome/renderer/audio_message_filter.h"
+#include "content/renderer/audio_message_filter.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/chrome/renderer/cookie_message_filter.cc b/content/renderer/cookie_message_filter.cc
similarity index 90%
rename from chrome/renderer/cookie_message_filter.cc
rename to content/renderer/cookie_message_filter.cc
index 6772f84e..06083c18 100644
--- a/chrome/renderer/cookie_message_filter.cc
+++ b/content/renderer/cookie_message_filter.cc
@@ -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 "chrome/renderer/cookie_message_filter.h"
+#include "content/renderer/cookie_message_filter.h"
#include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/cookie_message_filter.h b/content/renderer/cookie_message_filter.h
similarity index 85%
rename from chrome/renderer/cookie_message_filter.h
rename to content/renderer/cookie_message_filter.h
index 051ba62..3d0f6df 100644
--- a/chrome/renderer/cookie_message_filter.h
+++ b/content/renderer/cookie_message_filter.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 CHROME_RENDERER_COOKIE_MESSAGE_FILTER_H_
-#define CHROME_RENDERER_COOKIE_MESSAGE_FILTER_H_
+#ifndef CONTENT_RENDERER_COOKIE_MESSAGE_FILTER_H_
+#define CONTENT_RENDERER_COOKIE_MESSAGE_FILTER_H_
#pragma once
#include "base/synchronization/waitable_event.h"
@@ -27,4 +27,4 @@
base::WaitableEvent event_;
};
-#endif // CHROME_RENDERER_COOKIE_MESSAGE_FILTER_H_
+#endif // CONTENT_RENDERER_COOKIE_MESSAGE_FILTER_H_
diff --git a/chrome/renderer/device_orientation_dispatcher.cc b/content/renderer/device_orientation_dispatcher.cc
similarity index 97%
rename from chrome/renderer/device_orientation_dispatcher.cc
rename to content/renderer/device_orientation_dispatcher.cc
index 4565da0..309a3e83 100644
--- a/chrome/renderer/device_orientation_dispatcher.cc
+++ b/content/renderer/device_orientation_dispatcher.cc
@@ -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 "chrome/renderer/device_orientation_dispatcher.h"
+#include "content/renderer/device_orientation_dispatcher.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/render_messages_params.h"
diff --git a/chrome/renderer/device_orientation_dispatcher.h b/content/renderer/device_orientation_dispatcher.h
similarity index 87%
rename from chrome/renderer/device_orientation_dispatcher.h
rename to content/renderer/device_orientation_dispatcher.h
index 0d0115e9..a50a94f 100644
--- a/chrome/renderer/device_orientation_dispatcher.h
+++ b/content/renderer/device_orientation_dispatcher.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 CHROME_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_
-#define CHROME_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_
+#ifndef CONTENT_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_
+#define CONTENT_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClient.h"
@@ -39,4 +39,4 @@
bool started_;
};
-#endif // CHROME_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_
+#endif // CONTENT_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_
diff --git a/chrome/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc
similarity index 98%
rename from chrome/renderer/geolocation_dispatcher.cc
rename to content/renderer/geolocation_dispatcher.cc
index 8508754..0934aad 100644
--- a/chrome/renderer/geolocation_dispatcher.cc
+++ b/content/renderer/geolocation_dispatcher.cc
@@ -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 "chrome/renderer/geolocation_dispatcher.h"
+#include "content/renderer/geolocation_dispatcher.h"
#include "chrome/common/render_messages.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationPermissionRequest.h"
diff --git a/chrome/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h
similarity index 93%
rename from chrome/renderer/geolocation_dispatcher.h
rename to content/renderer/geolocation_dispatcher.h
index fb62cf39..2189946 100644
--- a/chrome/renderer/geolocation_dispatcher.h
+++ b/content/renderer/geolocation_dispatcher.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 CHROME_RENDERER_GEOLOCATION_DISPATCHER_H_
-#define CHROME_RENDERER_GEOLOCATION_DISPATCHER_H_
+#ifndef CONTENT_RENDERER_GEOLOCATION_DISPATCHER_H_
+#define CONTENT_RENDERER_GEOLOCATION_DISPATCHER_H_
#pragma once
#include "base/scoped_ptr.h"
@@ -63,4 +63,4 @@
bool updating_;
};
-#endif // CHROME_RENDERER_GEOLOCATION_DISPATCHER_H_
+#endif // CONTENT_RENDERER_GEOLOCATION_DISPATCHER_H_
diff --git a/chrome/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc
similarity index 99%
rename from chrome/renderer/indexed_db_dispatcher.cc
rename to content/renderer/indexed_db_dispatcher.cc
index b9184db..d62ad6f 100644
--- a/chrome/renderer/indexed_db_dispatcher.cc
+++ b/content/renderer/indexed_db_dispatcher.cc
@@ -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 "chrome/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/indexed_db_dispatcher.h"
#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/render_view.h"
diff --git a/chrome/renderer/indexed_db_dispatcher.h b/content/renderer/indexed_db_dispatcher.h
similarity index 97%
rename from chrome/renderer/indexed_db_dispatcher.h
rename to content/renderer/indexed_db_dispatcher.h
index 1283064..b019510 100644
--- a/chrome/renderer/indexed_db_dispatcher.h
+++ b/content/renderer/indexed_db_dispatcher.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 CHROME_RENDERER_INDEXED_DB_DISPATCHER_H_
-#define CHROME_RENDERER_INDEXED_DB_DISPATCHER_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_DISPATCHER_H_
+#define CONTENT_RENDERER_INDEXED_DB_DISPATCHER_H_
#pragma once
#include "base/id_map.h"
@@ -173,4 +173,4 @@
DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
};
-#endif // CHROME_RENDERER_INDEXED_DB_DISPATCHER_H_
+#endif // CONTENT_RENDERER_INDEXED_DB_DISPATCHER_H_
diff --git a/content/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc
index 86338e9..411a1d60 100644
--- a/content/renderer/media/audio_renderer_impl.cc
+++ b/content/renderer/media/audio_renderer_impl.cc
@@ -8,7 +8,6 @@
#include "chrome/common/render_messages.h"
#include "chrome/common/render_messages_params.h"
-#include "chrome/renderer/audio_message_filter.h"
#include "chrome/renderer/render_view.h"
#include "chrome/renderer/render_thread.h"
#include "media/base/filter_host.h"
diff --git a/content/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h
index c9f11a3..adb9674 100644
--- a/content/renderer/media/audio_renderer_impl.h
+++ b/content/renderer/media/audio_renderer_impl.h
@@ -43,7 +43,7 @@
#include "base/scoped_ptr.h"
#include "base/shared_memory.h"
#include "base/synchronization/lock.h"
-#include "chrome/renderer/audio_message_filter.h"
+#include "content/renderer/audio_message_filter.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_manager.h"
#include "media/base/filters.h"
diff --git a/chrome/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
similarity index 98%
rename from chrome/renderer/notification_provider.cc
rename to content/renderer/notification_provider.cc
index e3aeeb1..73633fc 100644
--- a/chrome/renderer/notification_provider.cc
+++ b/content/renderer/notification_provider.cc
@@ -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 "chrome/renderer/notification_provider.h"
+#include "content/renderer/notification_provider.h"
#include "base/string_util.h"
#include "base/task.h"
diff --git a/chrome/renderer/notification_provider.h b/content/renderer/notification_provider.h
similarity index 92%
rename from chrome/renderer/notification_provider.h
rename to content/renderer/notification_provider.h
index 5090b9fa..32abdee 100644
--- a/chrome/renderer/notification_provider.h
+++ b/content/renderer/notification_provider.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 CHROME_RENDERER_NOTIFICATION_PROVIDER_H_
-#define CHROME_RENDERER_NOTIFICATION_PROVIDER_H_
+#ifndef CONTENT_RENDERER_NOTIFICATION_PROVIDER_H_
+#define CONTENT_RENDERER_NOTIFICATION_PROVIDER_H_
#pragma once
#include "chrome/common/desktop_notifications/active_notification_tracker.h"
@@ -55,4 +55,4 @@
DISALLOW_COPY_AND_ASSIGN(NotificationProvider);
};
-#endif // CHROME_RENDERER_NOTIFICATION_PROVIDER_H_
+#endif // CONTENT_RENDERER_NOTIFICATION_PROVIDER_H_
diff --git a/chrome/renderer/speech_input_dispatcher.cc b/content/renderer/speech_input_dispatcher.cc
similarity index 98%
rename from chrome/renderer/speech_input_dispatcher.cc
rename to content/renderer/speech_input_dispatcher.cc
index 261357a..8175e403 100644
--- a/chrome/renderer/speech_input_dispatcher.cc
+++ b/content/renderer/speech_input_dispatcher.cc
@@ -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 "chrome/renderer/speech_input_dispatcher.h"
+#include "content/renderer/speech_input_dispatcher.h"
#include "base/utf_string_conversions.h"
#include "chrome/renderer/render_view.h"
diff --git a/chrome/renderer/speech_input_dispatcher.h b/content/renderer/speech_input_dispatcher.h
similarity index 94%
rename from chrome/renderer/speech_input_dispatcher.h
rename to content/renderer/speech_input_dispatcher.h
index 2fd9877..44513bb 100644
--- a/chrome/renderer/speech_input_dispatcher.h
+++ b/content/renderer/speech_input_dispatcher.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 CHROME_RENDERER_SPEECH_INPUT_DISPATCHER_H_
-#define CHROME_RENDERER_SPEECH_INPUT_DISPATCHER_H_
+#ifndef CONTENT_RENDERER_SPEECH_INPUT_DISPATCHER_H_
+#define CONTENT_RENDERER_SPEECH_INPUT_DISPATCHER_H_
#include "base/basictypes.h"
#include "chrome/renderer/render_view_observer.h"
