summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 01:01:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 01:01:06 +0000
commit34b9963c187a733bef76535521f3de688fffd34f (patch)
treea0569030e3a2ecc5b9c88d31a2469a380de85346 /webkit
parent1a2a571b157327f75acd56bd594ef0863481dc32 (diff)
downloadchromium_src-34b9963c187a733bef76535521f3de688fffd34f.zip
chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.gz
chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.bz2
Move base/thread.h to base/threading, fix up callers to use the new location.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/appcache/appcache_request_handler_unittest.cc2
-rw-r--r--webkit/appcache/appcache_response_unittest.cc2
-rw-r--r--webkit/appcache/appcache_storage_impl_unittest.cc2
-rw-r--r--webkit/appcache/appcache_update_job_unittest.cc2
-rw-r--r--webkit/appcache/appcache_url_request_job_unittest.cc2
-rw-r--r--webkit/blob/blob_url_request_job_unittest.cc2
-rw-r--r--webkit/glue/webmediaplayer_impl.h2
-rw-r--r--webkit/plugins/npapi/test/plugin_thread_async_call_test.cc2
-rw-r--r--webkit/tools/test_shell/simple_appcache_system.h2
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_request_context.h10
11 files changed, 15 insertions, 15 deletions
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc
index 1ffbb6f..870c439 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -7,7 +7,7 @@
#include <vector>
#include "base/message_loop.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/waitable_event.h"
#include "net/base/net_errors.h"
#include "net/url_request/url_request.h"
diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/appcache/appcache_response_unittest.cc
index 3c5f692..0535e1d 100644
--- a/webkit/appcache/appcache_response_unittest.cc
+++ b/webkit/appcache/appcache_response_unittest.cc
@@ -8,7 +8,7 @@
#include "base/compiler_specific.h"
#include "base/pickle.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/waitable_event.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc
index 87df2b0..701fdfa 100644
--- a/webkit/appcache/appcache_storage_impl_unittest.cc
+++ b/webkit/appcache/appcache_storage_impl_unittest.cc
@@ -5,7 +5,7 @@
#include <stack>
#include "base/message_loop.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/waitable_event.h"
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index 0c34cb6..b1d7016 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/appcache/appcache_update_job_unittest.cc
@@ -5,7 +5,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "base/stl_util-inl.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/waitable_event.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index 141b909..0cbbac1 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "base/pickle.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/waitable_event.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index a81f378..ac1c568 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -9,7 +9,7 @@
#include "base/file_util.h"
#include "base/scoped_temp_dir.h"
#include "base/task.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/time.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index bae0d9b..7fdd72a 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -57,7 +57,7 @@
#include "base/message_loop.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/waitable_event.h"
#include "gfx/rect.h"
#include "gfx/size.h"
diff --git a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc b/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc
index e28f84e..925c247 100644
--- a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc
+++ b/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc
@@ -6,7 +6,7 @@
#include "base/at_exit.h"
#include "base/message_loop.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "webkit/plugins/npapi/test/plugin_client.h"
namespace NPAPIClient {
diff --git a/webkit/tools/test_shell/simple_appcache_system.h b/webkit/tools/test_shell/simple_appcache_system.h
index f4e8b71..14fd2f2 100644
--- a/webkit/tools/test_shell/simple_appcache_system.h
+++ b/webkit/tools/test_shell/simple_appcache_system.h
@@ -7,7 +7,7 @@
#include "base/file_path.h"
#include "base/message_loop.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "webkit/appcache/appcache_backend_impl.h"
#include "webkit/appcache/appcache_frontend_impl.h"
#include "webkit/appcache/appcache_service.h"
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 079968e..ce5deea 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -43,7 +43,7 @@
#include "base/ref_counted.h"
#include "base/time.h"
#include "base/timer.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/waitable_event.h"
#include "net/base/cookie_store.h"
#include "net/base/file_stream.h"
diff --git a/webkit/tools/test_shell/test_shell_request_context.h b/webkit/tools/test_shell/test_shell_request_context.h
index 1cb4ec1..4baebc3 100644
--- a/webkit/tools/test_shell/test_shell_request_context.h
+++ b/webkit/tools/test_shell/test_shell_request_context.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H__
-#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H__
+#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_
+#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "net/http/http_cache.h"
#include "net/url_request/url_request_context.h"
@@ -42,4 +42,4 @@ class TestShellRequestContext : public URLRequestContext {
scoped_ptr<webkit_blob::BlobStorageController> blob_storage_controller_;
};
-#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H__
+#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_