Moved content/browser/gpu_* to content/browser/gpu/.

Also added an OWNERS file with myself and kbr.

TEST=build locally, try
BUG=none
Review URL: http://codereview.chromium.org/6931017

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

14 files changed, 37 insertions, 35 deletions

diff --git a/content/browser/gpu/OWNERS b/content/browser/gpu/OWNERS
new file mode 100644
index 0000000..f4ac342
--- /dev/null
+++ b/content/browser/gpu/OWNERS
@@ -0,0 +1,2 @@
+apatrick@chromium.org
+kbr@chromium.org
diff --git a/content/browser/gpu_blacklist.cc b/content/browser/gpu/gpu_blacklist.cc
index 3a2ff6c..6b0108a 100644
--- a/content/browser/gpu_blacklist.cc
+++ b/content/browser/gpu/gpu_blacklist.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/browser/gpu_blacklist.h"
+#include "content/browser/gpu/gpu_blacklist.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
diff --git a/content/browser/gpu_blacklist.h b/content/browser/gpu/gpu_blacklist.h
index 7e92a2a..134847c 100644
--- a/content/browser/gpu_blacklist.h
+++ b/content/browser/gpu/gpu_blacklist.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_BROWSER_GPU_BLACKLIST_H_
-#define CONTENT_BROWSER_GPU_BLACKLIST_H_
+#ifndef CONTENT_BROWSER_GPU_GPU_BLACKLIST_H_
+#define CONTENT_BROWSER_GPU_GPU_BLACKLIST_H_
 #pragma once
 
 #include <string>
@@ -301,4 +301,4 @@ class GpuBlacklist {
   DISALLOW_COPY_AND_ASSIGN(GpuBlacklist);
 };
 
-#endif  // CONTENT_BROWSER_GPU_BLACKLIST_H_
+#endif  // CONTENT_BROWSER_GPU_GPU_BLACKLIST_H_
diff --git a/content/browser/gpu_blacklist_unittest.cc b/content/browser/gpu/gpu_blacklist_unittest.cc
index 79cc0ac..55631a4 100644
--- a/content/browser/gpu_blacklist_unittest.cc
+++ b/content/browser/gpu/gpu_blacklist_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/version.h"
-#include "content/browser/gpu_blacklist.h"
+#include "content/browser/gpu/gpu_blacklist.h"
 #include "content/common/gpu/gpu_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/content/browser/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc
index 4b59c0c..a70e534 100644
--- a/content/browser/gpu_data_manager.cc
+++ b/content/browser/gpu/gpu_data_manager.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/gpu_data_manager.h"
+#include "content/browser/gpu/gpu_data_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/gpu_blacklist.h"
-#include "content/browser/gpu_process_host.h"
+#include "content/browser/gpu/gpu_blacklist.h"
+#include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/content_client.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/gpu/gpu_info_collector.h"
diff --git a/content/browser/gpu_data_manager.h b/content/browser/gpu/gpu_data_manager.h
index ddd77d97..77199e0 100644
--- a/content/browser/gpu_data_manager.h
+++ b/content/browser/gpu/gpu_data_manager.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_BROWSER_GPU_DATA_MANAGER_H_
-#define CONTENT_BROWSER_GPU_DATA_MANAGER_H_
+#ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_
+#define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_
 #pragma once
 
 #include <set>
@@ -105,4 +105,4 @@ class GpuDataManager {
   DISALLOW_COPY_AND_ASSIGN(GpuDataManager);
 };
 
-#endif  // CONTENT_BROWSER_GPU_DATA_MANAGER_H_
+#endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_H_
diff --git a/content/browser/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index df4d9a6..2330f39 100644
--- a/content/browser/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.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/browser/gpu_process_host.h"
+#include "content/browser/gpu/gpu_process_host.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
@@ -13,8 +13,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/gpu_data_manager.h"
-#include "content/browser/gpu_process_host_ui_shim.h"
+#include "content/browser/gpu/gpu_data_manager.h"
+#include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/gpu/gpu_messages.h"
diff --git a/content/browser/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index 3ced7a6..17ba8fe 100644
--- a/content/browser/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.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_BROWSER_GPU_PROCESS_HOST_H_
-#define CONTENT_BROWSER_GPU_PROCESS_HOST_H_
+#ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
+#define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #pragma once
 
 #include <map>
@@ -154,4 +154,4 @@ class GpuProcessHost : public BrowserChildProcessHost,
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
-#endif  // CONTENT_BROWSER_GPU_PROCESS_HOST_H_
+#endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
diff --git a/content/browser/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index e2dc11d..5fcf8805 100644
--- a/content/browser/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/gpu_process_host_ui_shim.h"
+#include "content/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include "base/command_line.h"
 #include "base/id_map.h"
 #include "base/process_util.h"
 #include "chrome/browser/browser_process.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/gpu_data_manager.h"
-#include "content/browser/gpu_process_host.h"
+#include "content/browser/gpu/gpu_data_manager.h"
+#include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
diff --git a/content/browser/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
index 7ea9190..d0782d7 100644
--- a/content/browser/gpu_process_host_ui_shim.h
+++ b/content/browser/gpu/gpu_process_host_ui_shim.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_BROWSER_GPU_PROCESS_HOST_UI_SHIM_H_
-#define CONTENT_BROWSER_GPU_PROCESS_HOST_UI_SHIM_H_
+#ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_UI_SHIM_H_
+#define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_UI_SHIM_H_
 #pragma once
 
 // This class lives on the UI thread and supports classes like the
@@ -120,4 +120,4 @@ class GpuProcessHostUIShim
   IPC::Channel::Sender* ui_thread_sender_;
 };
 
-#endif  // CONTENT_BROWSER_GPU_PROCESS_HOST_UI_SHIM_H_
+#endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_UI_SHIM_H_
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 5e3354c..24ee38e 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -42,8 +42,8 @@
 #include "content/browser/content_browser_client.h"
 #include "content/browser/device_orientation/message_filter.h"
 #include "content/browser/geolocation/geolocation_dispatcher_host.h"
-#include "content/browser/gpu_data_manager.h"
-#include "content/browser/gpu_process_host.h"
+#include "content/browser/gpu/gpu_data_manager.h"
+#include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/in_process_webkit/dom_storage_message_filter.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 #include "content/browser/file_system/file_system_dispatcher_host.h"
diff --git a/content/browser/renderer_host/gpu_message_filter.cc b/content/browser/renderer_host/gpu_message_filter.cc
index 49ad8be..5a98c13 100644
--- a/content/browser/renderer_host/gpu_message_filter.cc
+++ b/content/browser/renderer_host/gpu_message_filter.cc
@@ -10,7 +10,7 @@
 
 #include "base/callback.h"
 #include "chrome/common/render_messages.h"
-#include "content/browser/gpu_process_host.h"
+#include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/gpu/gpu_messages.h"
 
 GpuMessageFilter::GpuMessageFilter(int render_process_id)
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index 339b310..4b462dc 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -10,7 +10,7 @@
 #include "base/metrics/histogram.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/browser/gpu_process_host.h"
+#include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/backing_store_manager.h"
 #include "content/browser/renderer_host/render_process_host.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 7738ccc..13d01c1 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -131,14 +131,14 @@
         'browser/geolocation/win7_location_api_win.h',
         'browser/geolocation/win7_location_provider_win.cc',
         'browser/geolocation/win7_location_provider_win.h',
-        'browser/gpu_blacklist.cc',
-        'browser/gpu_blacklist.h',
-        'browser/gpu_data_manager.cc',
-        'browser/gpu_data_manager.h',
-        'browser/gpu_process_host.cc',
-        'browser/gpu_process_host.h',
-        'browser/gpu_process_host_ui_shim.cc',
-        'browser/gpu_process_host_ui_shim.h',
+        'browser/gpu/gpu_blacklist.cc',
+        'browser/gpu/gpu_blacklist.h',
+        'browser/gpu/gpu_data_manager.cc',
+        'browser/gpu/gpu_data_manager.h',
+        'browser/gpu/gpu_process_host.cc',
+        'browser/gpu/gpu_process_host.h',
+        'browser/gpu/gpu_process_host_ui_shim.cc',
+        'browser/gpu/gpu_process_host_ui_shim.h',
         'browser/host_zoom_map.cc',
         'browser/host_zoom_map.h',
         'browser/in_process_webkit/browser_webkitclient_impl.cc',