11 files changed, 21 insertions, 19 deletions
diff --git a/chrome_frame/cfproxy_private.h b/chrome_frame/cfproxy_private.h
index 796ed4a..307dcae 100644
--- a/chrome_frame/cfproxy_private.h
+++ b/chrome_frame/cfproxy_private.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 #include "chrome_frame/cfproxy.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 // Since we can't forward declare IPC::Message::Sender or IPC::Channel::Listener
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_channel.h"
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 4af3d2c..3a0a58b 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -25,7 +25,7 @@
 #include "base/process_util.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "base/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
index 598966b..0050d14 100644
--- a/chrome_frame/chrome_active_document.h
+++ b/chrome_frame/chrome_active_document.h
@@ -17,7 +17,7 @@
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_comptr_win.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 
 #include "chrome_frame/chrome_frame_activex_base.h"
 #include "chrome_frame/com_type_info_holder.h"
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 73d4f1d..a8395d2 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -16,7 +16,7 @@
 #include "base/scoped_handle.h"
 #include "base/stack_container.h"
 #include "base/task.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "base/timer.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/test/automation/automation_proxy.h"
diff --git a/chrome_frame/crash_reporting/nt_loader_unittest.cc b/chrome_frame/crash_reporting/nt_loader_unittest.cc
index 2c46eab..2d1f838 100644
--- a/chrome_frame/crash_reporting/nt_loader_unittest.cc
+++ b/chrome_frame/crash_reporting/nt_loader_unittest.cc
@@ -1,19 +1,21 @@
 // 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 "chrome_frame/crash_reporting/nt_loader.h"
 
 #include <tlhelp32.h>
 #include <winnt.h>
-#include <base/at_exit.h>
-#include <base/environment.h>
-#include <base/message_loop.h>
-#include <base/scoped_handle.h>
-#include <base/scoped_ptr.h>
-#include <base/string_util.h>
-#include <base/sys_info.h>
-#include <base/thread.h>
-#include <base/utf_string_conversions.h>
+
+#include "base/at_exit.h"
+#include "base/environment.h"
+#include "base/message_loop.h"
+#include "base/scoped_handle.h"
+#include "base/scoped_ptr.h"
+#include "base/string_util.h"
+#include "base/sys_info.h"
+#include "base/threading/thread.h"
+#include "base/utf_string_conversions.h"
 #include "chrome_frame/crash_reporting/crash_dll.h"
 #include "gtest/gtest.h"
 
diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc
index f44ce39..5c503a8 100644
--- a/chrome_frame/external_tab_test.cc
+++ b/chrome_frame/external_tab_test.cc
@@ -4,7 +4,7 @@
 
 #include "chrome_frame/external_tab.h"
 #include "base/task.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "base/tracked.h"
 
 // #include "base/waitable_event.h"
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index d82e16b..7b9570b 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -58,7 +58,7 @@
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_version_info.h"
diff --git a/chrome_frame/test/urlmon_moniker_integration_test.cc b/chrome_frame/test/urlmon_moniker_integration_test.cc
index 311b0af..4e9c29b9 100644
--- a/chrome_frame/test/urlmon_moniker_integration_test.cc
+++ b/chrome_frame/test/urlmon_moniker_integration_test.cc
@@ -6,7 +6,7 @@
 #include <atlcom.h>
 
 #include "base/scoped_comptr_win.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "chrome_frame/bho.h"
 //#include "chrome_frame/urlmon_moniker.h"
 #include "chrome_frame/test/test_server.h"
diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h
index dcc0b7b..a0c9605 100644
--- a/chrome_frame/urlmon_url_request.h
+++ b/chrome_frame/urlmon_url_request.h
@@ -12,7 +12,7 @@
 #include <string>
 
 #include "base/lock.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "chrome_frame/plugin_url_request.h"
 #include "chrome_frame/urlmon_moniker.h"
 #include "chrome_frame/utils.h"
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index 773b65f..97f9284 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -16,7 +16,7 @@
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "base/win/scoped_comptr.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome_frame/vtable_patch_manager_unittest.cc b/chrome_frame/vtable_patch_manager_unittest.cc
index 10c73be..4e04796 100644
--- a/chrome_frame/vtable_patch_manager_unittest.cc
+++ b/chrome_frame/vtable_patch_manager_unittest.cc
@@ -5,7 +5,7 @@
 #include "chrome_frame/vtable_patch_manager.h"
 #include <unknwn.h>
 #include "base/message_loop.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
 #include "base/scoped_handle.h"
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"