Move more GPU related files from content/common to content/common/gpu.

This is just moving files and updating references. There are no functional changes.

TEST=trybots
BUG=none
Review URL: http://codereview.chromium.org/6881072

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82715 0039d316-1c4b-4281-b951-d872f2087c98

33 files changed, 44 insertions, 42 deletions

diff --git a/content/browser/gpu_blacklist.h b/content/browser/gpu_blacklist.h
index a7a5d73..7e92a2a 100644
--- a/content/browser/gpu_blacklist.h
+++ b/content/browser/gpu_blacklist.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "content/common/gpu_feature_flags.h"
+#include "content/common/gpu/gpu_feature_flags.h"
 
 class DictionaryValue;
 class Version;
diff --git a/content/browser/gpu_process_host.cc b/content/browser/gpu_process_host.cc
index 3cdb894..ac27adb 100644
--- a/content/browser/gpu_process_host.cc
+++ b/content/browser/gpu_process_host.cc
@@ -16,7 +16,7 @@
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media_switches.h"
diff --git a/content/browser/gpu_process_host.h b/content/browser/gpu_process_host.h
index 7513beb..247f079 100644
--- a/content/browser/gpu_process_host.h
+++ b/content/browser/gpu_process_host.h
@@ -8,8 +8,8 @@
 
 #include "base/threading/non_thread_safe.h"
 #include "content/browser/browser_child_process_host.h"
-#include "content/common/gpu_feature_flags.h"
-#include "content/common/gpu_process_launch_causes.h"
+#include "content/common/gpu/gpu_feature_flags.h"
+#include "content/common/gpu/gpu_process_launch_causes.h"
 
 namespace IPC {
 class Message;
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 44217ed..25bab9c 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -89,7 +89,7 @@
 #include "content/browser/worker_host/worker_message_filter.h"
 #include "content/common/child_process_info.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/notification_service.h"
 #include "content/common/process_watcher.h"
 #include "content/common/resource_messages.h"
diff --git a/content/browser/renderer_host/gpu_message_filter.cc b/content/browser/renderer_host/gpu_message_filter.cc
index 5fa10ad..74905d2 100644
--- a/content/browser/renderer_host/gpu_message_filter.cc
+++ b/content/browser/renderer_host/gpu_message_filter.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/gpu_process_host_ui_shim.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/gpu_process_host.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 
 GpuMessageFilter::GpuMessageFilter(int render_process_id)
     : gpu_host_id_(0),
diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h
index c8e8ada..05c5aba 100644
--- a/content/browser/renderer_host/gpu_message_filter.h
+++ b/content/browser/renderer_host/gpu_message_filter.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "content/browser/browser_message_filter.h"
-#include "content/common/gpu_process_launch_causes.h"
+#include "content/common/gpu/gpu_process_launch_causes.h"
 #include "ui/gfx/native_widget_types.h"
 
 class GpuProcessHost;
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index d7ad0b5..47894ac 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -19,7 +19,7 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/notification_service.h"
 #include "content/common/result_codes.h"
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 10c9fd8..21c3e76 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -20,7 +20,7 @@
 #include "content/common/file_system_messages.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/geolocation_messages.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/common/p2p_messages.h"
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index 0da5925..f669f9c 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -14,8 +14,8 @@
 #include "content/common/child_process.h"
 #include "content/common/content_client.h"
 #include "content/common/content_switches.h"
-#include "content/common/gpu_messages.h"
 #include "content/common/gpu/gpu_channel_manager.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_video_service.h"
 #include "content/common/gpu/transport_texture.h"
  
diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
index 0cce977..2c484c2 100644
--- a/content/common/gpu/gpu_channel_manager.cc
+++ b/content/common/gpu/gpu_channel_manager.cc
@@ -12,7 +12,7 @@
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_implementation.h"
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index 91a8062..8fc0855 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -9,10 +9,10 @@
 #include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "content/common/child_thread.h"
-#include "content/common/gpu_messages.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_watchdog.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/common/gpu_trace_event.h"
diff --git a/content/common/gpu_feature_flags.cc b/content/common/gpu/gpu_feature_flags.cc
index 73b42b9..437a5b3 100644
--- a/content/common/gpu_feature_flags.cc
+++ b/content/common/gpu/gpu_feature_flags.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 "content/common/gpu_feature_flags.h"
+#include "content/common/gpu/gpu_feature_flags.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
diff --git a/content/common/gpu_feature_flags.h b/content/common/gpu/gpu_feature_flags.h
index 0068ae0..99c6576 100644
--- a/content/common/gpu_feature_flags.h
+++ b/content/common/gpu/gpu_feature_flags.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 CONTENT_COMMON_GPU_FEATURE_FLAGS_H_
-#define CONTENT_COMMON_GPU_FEATURE_FLAGS_H_
+#ifndef CONTENT_COMMON_GPU_GPU_FEATURE_FLAGS_H_
+#define CONTENT_COMMON_GPU_GPU_FEATURE_FLAGS_H_
 #pragma once
 
 // Provides flags indicating which gpu features are blacklisted for the system
@@ -64,4 +64,4 @@ class GpuFeatureFlags {
   uint32 flags_;
 };
 
-#endif  // CONTENT_COMMON_GPU_FEATURE_FLAGS_H_
+#endif  // CONTENT_COMMON_GPU_GPU_FEATURE_FLAGS_H_
diff --git a/content/common/gpu_feature_flags_unittest.cc b/content/common/gpu/gpu_feature_flags_unittest.cc
index 370fef4..550af23 100644
--- a/content/common/gpu_feature_flags_unittest.cc
+++ b/content/common/gpu/gpu_feature_flags_unittest.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 "content/common/gpu_feature_flags.h"
+#include "content/common/gpu/gpu_feature_flags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(GpuFeatureFlagsTest, GpuFeatureFlagsBasic) {
diff --git a/content/common/gpu_messages.h b/content/common/gpu/gpu_messages.h
index 73fad10..22c4a23 100644
--- a/content/common/gpu_messages.h
+++ b/content/common/gpu/gpu_messages.h
@@ -9,7 +9,7 @@
 #include "base/shared_memory.h"
 #include "content/common/common_param_traits.h"
 #include "content/common/gpu/gpu_info.h"
-#include "content/common/gpu_process_launch_causes.h"
+#include "content/common/gpu/gpu_process_launch_causes.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/ipc/gpu_command_buffer_traits.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/content/common/gpu_process_launch_causes.h b/content/common/gpu/gpu_process_launch_causes.h
index 3d5128f..b4ce88b 100644
--- a/content/common/gpu_process_launch_causes.h
+++ b/content/common/gpu/gpu_process_launch_causes.h
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_PROCESS_LAUNCH_CAUSES_H_
-#define CONTENT_COMMON_GPU_PROCESS_LAUNCH_CAUSES_H_
+#ifndef CONTENT_COMMON_GPU_GPU_PROCESS_LAUNCH_CAUSES_H_
+#define CONTENT_COMMON_GPU_GPU_PROCESS_LAUNCH_CAUSES_H_
 #pragma once
 
 namespace content {
 
+// If you change this enum you also need to update
+// tools/histograms/histograms.xml.
 enum CauseForGpuLaunch {
   CAUSE_FOR_GPU_LAUNCH_ABOUT_GPUCRASH,
   CAUSE_FOR_GPU_LAUNCH_ABOUT_GPUHANG,
@@ -21,4 +23,4 @@ enum CauseForGpuLaunch {
 }  // namespace content
 
 
-#endif  // CONTENT_COMMON_GPU_PROCESS_LAUNCH_CAUSES_H_
+#endif  // CONTENT_COMMON_GPU_GPU_PROCESS_LAUNCH_CAUSES_H_
diff --git a/content/common/gpu/gpu_video_decoder.cc b/content/common/gpu/gpu_video_decoder.cc
index 1b89a01..b93d482 100644
--- a/content/common/gpu/gpu_video_decoder.cc
+++ b/content/common/gpu/gpu_video_decoder.cc
@@ -7,9 +7,9 @@
 #include "base/command_line.h"
 #include "content/common/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/media/fake_gl_video_device.h"
 #include "content/common/gpu/media/fake_gl_video_decode_engine.h"
-#include "content/common/gpu_messages.h"
 #include "media/base/data_buffer.h"
 #include "media/base/media_switches.h"
 #include "media/base/video_frame.h"
diff --git a/content/common/gpu/gpu_video_decoder_unittest.cc b/content/common/gpu/gpu_video_decoder_unittest.cc
index b9c846f..78e46cf 100644
--- a/content/common/gpu/gpu_video_decoder_unittest.cc
+++ b/content/common/gpu/gpu_video_decoder_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "base/message_loop.h"
 #include "base/process.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_video_decoder.h"
-#include "content/common/gpu_messages.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/base/pipeline.h"
diff --git a/content/common/gpu/gpu_video_service.cc b/content/common/gpu/gpu_video_service.cc
index 3128534..f6d0ba1 100644
--- a/content/common/gpu/gpu_video_service.cc
+++ b/content/common/gpu/gpu_video_service.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "content/common/gpu/gpu_channel.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_video_decoder.h"
 #include "content/common/gpu/gpu_video_service.h"
-#include "content/common/gpu_messages.h"
 
 struct GpuVideoService::GpuVideoDecoderInfo {
   scoped_refptr<GpuVideoDecoder> decoder;
diff --git a/content/common/gpu/transport_texture.cc b/content/common/gpu/transport_texture.cc
index 0f99791..f61f2f91 100644
--- a/content/common/gpu/transport_texture.cc
+++ b/content/common/gpu/transport_texture.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/gpu_messages.h"
 #include "content/common/gpu/gpu_channel.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/transport_texture.h"
 
 TransportTexture::TransportTexture(GpuChannel* channel,
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 743b74a..ff1a7ae 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -92,8 +92,6 @@
         'common/font_descriptor_mac.mm',
         'common/font_loader_mac.h',
         'common/font_loader_mac.mm',
-        'common/gpu_feature_flags.cc',
-        'common/gpu_feature_flags.h',
         'common/geolocation_messages.h',
         'common/geoposition.cc',
         'common/geoposition.h',
@@ -104,8 +102,12 @@
         'common/gpu/gpu_command_buffer_stub.cc',
         'common/gpu/gpu_command_buffer_stub.h',
         'common/gpu/gpu_config.h',
+        'common/gpu/gpu_feature_flags.cc',
+        'common/gpu/gpu_feature_flags.h',
         'common/gpu/gpu_info.cc',
         'common/gpu/gpu_info.h',
+        'common/gpu/gpu_messages.h',
+        'common/gpu/gpu_process_launch_casues.h',
         'common/gpu/gpu_video_decoder.cc',
         'common/gpu/gpu_video_decoder.h',
         'common/gpu/gpu_video_service.cc',
@@ -118,8 +120,6 @@
         'common/gpu/media/fake_gl_video_device.h',
         'common/gpu/transport_texture.cc',
         'common/gpu/transport_texture.h',
-        'common/gpu_process_launch_causes.h',
-        'common/gpu_messages.h',
         'common/hi_res_timer_manager_posix.cc',
         'common/hi_res_timer_manager_win.cc',
         'common/hi_res_timer_manager.h',
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index e5bf6d6..e3b90da 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -14,7 +14,7 @@
 #include "content/common/child_process.h"
 #include "content/common/content_client.h"
 #include "content/common/content_switches.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/content/gpu/gpu_video_decode_accelerator.cc b/content/gpu/gpu_video_decode_accelerator.cc
index cc1a53e..17b5441 100644
--- a/content/gpu/gpu_video_decode_accelerator.cc
+++ b/content/gpu/gpu_video_decode_accelerator.cc
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "base/shared_memory.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/video/picture.h"
diff --git a/content/gpu/gpu_video_decode_accelerator_tester.cc b/content/gpu/gpu_video_decode_accelerator_tester.cc
index 87a679d..e95f73d 100644
--- a/content/gpu/gpu_video_decode_accelerator_tester.cc
+++ b/content/gpu/gpu_video_decode_accelerator_tester.cc
@@ -21,7 +21,7 @@
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "content/common/common_param_traits.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/gpu/gpu_video_decode_accelerator.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
diff --git a/content/renderer/command_buffer_proxy.cc b/content/renderer/command_buffer_proxy.cc
index 95bcb4c..42af276 100644
--- a/content/renderer/command_buffer_proxy.cc
+++ b/content/renderer/command_buffer_proxy.cc
@@ -8,7 +8,7 @@
 #include "base/process_util.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/plugin_channel_host.h"
diff --git a/content/renderer/gpu_channel_host.cc b/content/renderer/gpu_channel_host.cc
index 97fd549..401e006 100644
--- a/content/renderer/gpu_channel_host.cc
+++ b/content/renderer/gpu_channel_host.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/gpu_channel_host.h"
 
 #include "content/common/child_process.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/renderer/command_buffer_proxy.h"
 #include "content/renderer/gpu_video_service_host.h"
 #include "content/renderer/render_thread.h"
diff --git a/content/renderer/gpu_video_decoder_host.cc b/content/renderer/gpu_video_decoder_host.cc
index 315cd32..d9284fb 100644
--- a/content/renderer/gpu_video_decoder_host.cc
+++ b/content/renderer/gpu_video_decoder_host.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/gpu_video_decoder_host.h"
 
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/message_router.h"
 #include "media/base/pipeline.h"
 #include "media/video/video_decode_context.h"
diff --git a/content/renderer/gpu_video_decoder_host_unittest.cc b/content/renderer/gpu_video_decoder_host_unittest.cc
index e9f69a6..088622e 100644
--- a/content/renderer/gpu_video_decoder_host_unittest.cc
+++ b/content/renderer/gpu_video_decoder_host_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/message_router.h"
-#include "content/common/gpu_messages.h"
 #include "content/renderer/gpu_video_decoder_host.h"
 #include "media/base/pipeline.h"
 #include "media/video/video_mock_objects.h"
diff --git a/content/renderer/gpu_video_service_host.cc b/content/renderer/gpu_video_service_host.cc
index c1ed5db..abec3fe 100644
--- a/content/renderer/gpu_video_service_host.cc
+++ b/content/renderer/gpu_video_service_host.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/gpu_video_service_host.h"
 
+#include "content/common/gpu/gpu_messages.h"
 #include "content/renderer/gpu_video_decoder_host.h"
-#include "content/common/gpu_messages.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/video_decode_accelerator_host.h"
 #include "media/video/video_decode_accelerator.h"
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 1a77c3f..e6683c5 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -26,7 +26,7 @@
 #include "content/common/database_messages.h"
 #include "content/common/db_message_filter.h"
 #include "content/common/dom_storage_messages.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/resource_messages.h"
diff --git a/content/renderer/render_thread.h b/content/renderer/render_thread.h
index f4fcf54..704e727 100644
--- a/content/renderer/render_thread.h
+++ b/content/renderer/render_thread.h
@@ -17,7 +17,7 @@
 #include "build/build_config.h"
 #include "content/common/child_thread.h"
 #include "content/common/css_colors.h"
-#include "content/common/gpu_process_launch_causes.h"
+#include "content/common/gpu/gpu_process_launch_causes.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/content/renderer/transport_texture_host.cc b/content/renderer/transport_texture_host.cc
index db420ca..543aa49 100644
--- a/content/renderer/transport_texture_host.cc
+++ b/content/renderer/transport_texture_host.cc
@@ -13,7 +13,7 @@
 #if !defined(OS_MACOSX)
 
 #include "base/message_loop.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/renderer/renderer_gl_context.h"
 #include "content/renderer/transport_texture_service.h"
 
diff --git a/content/renderer/transport_texture_service.cc b/content/renderer/transport_texture_service.cc
index d482bed..0996352 100644
--- a/content/renderer/transport_texture_service.cc
+++ b/content/renderer/transport_texture_service.cc
@@ -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.
 
@@ -6,7 +6,7 @@
 
 #include "base/stl_util-inl.h"
 #include "content/common/child_process.h"
-#include "content/common/gpu_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/renderer/transport_texture_host.h"
 
 TransportTextureService::TransportTextureService()