Move base/thread.h to base/threading, fix up callers to use the new l…

…ocation. 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
dednal · Jan 1, 2011 · 34b9963 · 34b9963
1 parent 1a2a571
commit 34b9963
Show file tree

Hide file tree

Showing 273 changed files with 311 additions and 308 deletions.
diff --git a/app/x11_util.cc b/app/x11_util.cc
@@ -22,7 +22,7 @@
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "app/x11_util_internal.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"

diff --git a/base/base.gyp b/base/base.gyp
@@ -142,13 +142,13 @@
         'threading/platform_thread_unittest.cc',
         'threading/simple_thread_unittest.cc',
         'threading/thread_checker_unittest.cc',
+        'threading/thread_collision_warner_unittest.cc',
         'threading/thread_local_storage_unittest.cc',
         'threading/thread_local_unittest.cc',
+        'threading/thread_unittest.cc',
         'threading/watchdog_unittest.cc',
         'threading/worker_pool_posix_unittest.cc',
         'threading/worker_pool_unittest.cc',
-        'thread_collision_warner_unittest.cc',
-        'thread_unittest.cc',
         'time_unittest.cc',
         'time_win_unittest.cc',
         'timer_unittest.cc',

diff --git a/base/base.gypi b/base/base.gypi
@@ -245,26 +245,26 @@
           'threading/platform_thread_win.cc',
           'threading/simple_thread.cc',
           'threading/simple_thread.h',
+          'threading/thread.cc',
+          'threading/thread.h',
           'threading/thread_checker.cc',
           'threading/thread_checker.h',
+          'threading/thread_collision_warner.cc',
+          'threading/thread_collision_warner.h',
           'threading/thread_local.h',
           'threading/thread_local_posix.cc',
           'threading/thread_local_storage.h',
           'threading/thread_local_storage_posix.cc',
           'threading/thread_local_storage_win.cc',
           'threading/thread_local_win.cc',
+          'threading/thread_restrictions.h',
+          'threading/thread_restrictions.cc',
           'threading/watchdog.cc',
           'threading/watchdog.h',
           'threading/worker_pool.h',
           'threading/worker_pool_posix.cc',
           'threading/worker_pool_posix.h',
           'threading/worker_pool_win.cc',
-          'thread.cc',
-          'thread.h',
-          'thread_collision_warner.cc',
-          'thread_collision_warner.h',
-          'thread_restrictions.h',
-          'thread_restrictions.cc',
           'time.cc',
           'time.h',
           'time_win.cc',

diff --git a/base/cancellation_flag_unittest.cc b/base/cancellation_flag_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop.h"
 #include "base/spin_wait.h"
 #include "base/time.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 

diff --git a/base/condition_variable_unittest.cc b/base/condition_variable_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/scoped_ptr.h"
 #include "base/spin_wait.h"
 #include "base/threading/platform_thread.h"
-#include "base/thread_collision_warner.h"
+#include "base/threading/thread_collision_warner.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"

diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
@@ -38,7 +38,7 @@
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 

diff --git a/base/file_util_win.cc b/base/file_util_win.cc
@@ -19,7 +19,7 @@
 #include "base/win/scoped_handle.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"

diff --git a/base/file_version_info_win.cc b/base/file_version_info_win.cc
@@ -10,7 +10,7 @@
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 // This has to be last.
 #include <strsafe.h>

diff --git a/base/lazy_instance.h b/base/lazy_instance.h
@@ -41,7 +41,7 @@
 #include "base/atomicops.h"
 #include "base/basictypes.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 namespace base {
 

diff --git a/base/message_loop_proxy_impl.cc b/base/message_loop_proxy_impl.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/message_loop_proxy_impl.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 namespace base {
 

diff --git a/base/message_loop_proxy_impl_unittest.cc b/base/message_loop_proxy_impl_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/message_loop.h"
 #include "base/message_loop_proxy_impl.h"
 #include "base/scoped_ptr.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 

diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "base/threading/platform_thread.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)

diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc
@@ -12,7 +12,7 @@
 
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

diff --git a/base/native_library_linux.cc b/base/native_library_linux.cc
@@ -8,7 +8,7 @@
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {

diff --git a/base/native_library_win.cc b/base/native_library_win.cc
@@ -7,7 +7,7 @@
 #include <windows.h>
 
 #include "base/file_util.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {

diff --git a/base/nss_util.cc b/base/nss_util.cc
@@ -22,7 +22,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 // USE_NSS means we use NSS for everything crypto-related.  If USE_NSS is not
 // defined, such as on Mac and Windows, we use NSS for SSL only -- we don't

diff --git a/base/platform_file_win.cc b/base/platform_file_win.cc
@@ -6,7 +6,7 @@
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 namespace base {
 

diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
@@ -22,7 +22,7 @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 namespace {
 

diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
@@ -26,7 +26,7 @@
 #include "base/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/waitable_event.h"
 

diff --git a/base/ref_counted.cc b/base/ref_counted.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2009 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.
 
 #include "base/ref_counted.h"
 
 #include "base/logging.h"
-#include "base/thread_collision_warner.h"
+#include "base/threading/thread_collision_warner.h"
 
 namespace base {
 

diff --git a/base/ref_counted.h b/base/ref_counted.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/atomic_ref_count.h"
-#include "base/thread_collision_warner.h"
+#include "base/threading/thread_collision_warner.h"
 
 namespace base {
 

diff --git a/base/shared_memory_posix.cc b/base/shared_memory_posix.cc
@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/threading/platform_thread.h"
 #include "base/safe_strerror_posix.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {

diff --git a/base/singleton.h b/base/singleton.h
@@ -10,7 +10,7 @@
 #include "base/atomicops.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/threading/platform_thread.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 // Default traits for Singleton<Type>. Calls operator new and operator delete on
 // the object. Registers automatic deletion at process exit.

diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc
@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 namespace base {
 

diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/safe_strerror_posix.h"
 #include "base/scoped_ptr.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 #if defined(OS_MACOSX)
 #include <mach/mach.h>

diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
@@ -5,7 +5,7 @@
 #include "base/threading/platform_thread.h"
 
 #include "base/logging.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/win/windows_version.h"
 
 namespace base {

diff --git a/base/thread.cc → base/threading/thread.cc b/base/thread.cc → base/threading/thread.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 "base/thread.h"
+#include "base/threading/thread.h"
 
 #include "base/lazy_instance.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"

diff --git a/base/thread.h → base/threading/thread.h b/base/thread.h → base/threading/thread.h
diff --git a/base/thread_collision_warner.cc → base/threading/thread_collision_warner.cc b/base/thread_collision_warner.cc → base/threading/thread_collision_warner.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "base/thread_collision_warner.h"
+#include "base/threading/thread_collision_warner.h"
 
 #include "base/logging.h"
 #include "base/threading/platform_thread.h"

diff --git a/base/thread_collision_warner.h → base/threading/thread_collision_warner.h b/base/thread_collision_warner.h → base/threading/thread_collision_warner.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 BASE_THREAD_COLLISION_WARNER_H_
-#define BASE_THREAD_COLLISION_WARNER_H_
+#ifndef BASE_THREADING_THREAD_COLLISION_WARNER_H_
+#define BASE_THREADING_THREAD_COLLISION_WARNER_H_
 #pragma once
 
 #include <memory>
@@ -240,4 +240,4 @@ class ThreadCollisionWarner {
 
 }  // namespace base
 
-#endif  // BASE_THREAD_COLLISION_WARNER_H_
+#endif  // BASE_THREADING_THREAD_COLLISION_WARNER_H_
diff --git a/base/thread_collision_warner_unittest.cc → ...ading/thread_collision_warner_unittest.cc b/base/thread_collision_warner_unittest.cc → ...ading/thread_collision_warner_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/simple_thread.h"
-#include "base/thread_collision_warner.h"
+#include "base/threading/thread_collision_warner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // '' : local class member function does not have a body

diff --git a/base/thread_restrictions.cc → base/threading/thread_restrictions.cc b/base/thread_restrictions.cc → base/threading/thread_restrictions.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 "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 // This entire file is compiled out in Release mode.
 #ifndef NDEBUG

diff --git a/base/thread_restrictions.h → base/threading/thread_restrictions.h b/base/thread_restrictions.h → base/threading/thread_restrictions.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 BASE_THREAD_RESTRICTIONS_H_
-#define BASE_THREAD_RESTRICTIONS_H_
+#ifndef BASE_THREADING_THREAD_RESTRICTIONS_H_
+#define BASE_THREADING_THREAD_RESTRICTIONS_H_
 
 #include "base/basictypes.h"
 
@@ -97,4 +97,4 @@ class ThreadRestrictions {
 
 }  // namespace base
 
-#endif  // BASE_THREAD_RESTRICTIONS_H_
+#endif  // BASE_THREADING_THREAD_RESTRICTIONS_H_
diff --git a/base/thread_unittest.cc → base/threading/thread_unittest.cc b/base/thread_unittest.cc → base/threading/thread_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 "base/thread.h"
+#include "base/threading/thread.h"
 
 #include <vector>
 

diff --git a/base/tools_sanity_unittest.cc b/base/tools_sanity_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/message_loop.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {

diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 using base::TimeDelta;
 

diff --git a/base/weak_ptr_unittest.cc b/base/weak_ptr_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "base/message_loop.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "base/scoped_ptr.h"
 #include "base/weak_ptr.h"
 

diff --git a/base/win/registry.cc b/base/win/registry.cc
@@ -7,7 +7,7 @@
 #include <shlwapi.h>
 
 #include "base/logging.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 
 #pragma comment(lib, "shlwapi.lib")  // for SHDeleteKey
 

diff --git a/base/win/win_util.cc b/base/win/win_util.cc
@@ -17,7 +17,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/win/windows_version.h"
 
 namespace base {