diff options
24 files changed, 62 insertions, 25 deletions
diff --git a/base/cancellation_flag_unittest.cc b/base/cancellation_flag_unittest.cc index 52f6b1e..eb28b53 100644 --- a/base/cancellation_flag_unittest.cc +++ b/base/cancellation_flag_unittest.cc @@ -1,4 +1,4 @@ -// 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. @@ -7,6 +7,7 @@ #include "base/cancellation_flag.h" #include "base/logging.h" +#include "base/message_loop.h" #include "base/spin_wait.h" #include "base/time.h" #include "base/thread.h" diff --git a/base/weak_ptr_unittest.cc b/base/weak_ptr_unittest.cc index df79606d..0713983 100644 --- a/base/weak_ptr_unittest.cc +++ b/base/weak_ptr_unittest.cc @@ -1,8 +1,9 @@ -// 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 "testing/gtest/include/gtest/gtest.h" +#include "base/message_loop.h" #include "base/thread.h" #include "base/weak_ptr.h" diff --git a/chrome/browser/chrome_thread.cc b/chrome/browser/chrome_thread.cc index 13975d6..300c2f6 100644 --- a/chrome/browser/chrome_thread.cc +++ b/chrome/browser/chrome_thread.cc @@ -1,9 +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 "chrome/browser/chrome_thread.h" +#include "base/message_loop.h" + // Friendly names for the well-known threads. static const char* chrome_thread_names[ChromeThread::ID_COUNT] = { "", // UI (name assembled in browser_main.cc). diff --git a/chrome/browser/chrome_thread_unittest.cc b/chrome/browser/chrome_thread_unittest.cc index f322e6d..58a3dc3 100644 --- a/chrome/browser/chrome_thread_unittest.cc +++ b/chrome/browser/chrome_thread_unittest.cc @@ -1,7 +1,8 @@ -// 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/message_loop.h" #include "chrome/browser/chrome_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc index 6d0f308..0567c8c 100644 --- a/chrome/browser/dom_ui/net_internals_ui.cc +++ b/chrome/browser/dom_ui/net_internals_ui.cc @@ -4,10 +4,14 @@ #include "chrome/browser/dom_ui/net_internals_ui.h" +#include <algorithm> #include <sstream> +#include <string> +#include <vector> #include "app/resource_bundle.h" #include "base/file_util.h" +#include "base/message_loop.h" #include "base/path_service.h" #include "base/singleton.h" #include "base/string_piece.h" diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc index 90905ee..fcaf606 100644 --- a/chrome/browser/dom_ui/plugins_ui.cc +++ b/chrome/browser/dom_ui/plugins_ui.cc @@ -4,8 +4,13 @@ #include "chrome/browser/dom_ui/plugins_ui.h" +#include <algorithm> +#include <string> +#include <vector> + #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/message_loop.h" #include "base/singleton.h" #include "base/values.h" #include "chrome/browser/browser.h" diff --git a/chrome/browser/extensions/extension_idle_api.cc b/chrome/browser/extensions/extension_idle_api.cc index 949993f..da1e2b1 100644 --- a/chrome/browser/extensions/extension_idle_api.cc +++ b/chrome/browser/extensions/extension_idle_api.cc @@ -7,14 +7,17 @@ #include "chrome/browser/extensions/extension_idle_api.h" -#include "base/stl_util-inl.h" +#include <string> + #include "base/json/json_writer.h" +#include "base/message_loop.h" +#include "base/stl_util-inl.h" #include "base/task.h" #include "base/time.h" #include "chrome/browser/browser.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extension_idle_api_constants.h" +#include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/file_reader.cc b/chrome/browser/extensions/file_reader.cc index e848c2e..c6f19f6 100644 --- a/chrome/browser/extensions/file_reader.cc +++ b/chrome/browser/extensions/file_reader.cc @@ -1,10 +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 "chrome/browser/extensions/file_reader.h" #include "base/file_util.h" +#include "base/message_loop.h" #include "chrome/browser/chrome_thread.h" #include "chrome/common/extensions/extension_resource.h" diff --git a/chrome/browser/important_file_writer.cc b/chrome/browser/important_file_writer.cc index 9dd8f9e..3d2029a 100644 --- a/chrome/browser/important_file_writer.cc +++ b/chrome/browser/important_file_writer.cc @@ -1,4 +1,4 @@ -// 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. @@ -12,6 +12,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/message_loop.h" #include "base/string_util.h" #include "base/task.h" #include "base/thread.h" diff --git a/chrome/browser/in_process_webkit/webkit_thread.h b/chrome/browser/in_process_webkit/webkit_thread.h index 8ef9051..2c0a2c2 100644 --- a/chrome/browser/in_process_webkit/webkit_thread.h +++ b/chrome/browser/in_process_webkit/webkit_thread.h @@ -1,6 +1,6 @@ -// 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. +// 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 CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ #define CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ @@ -8,6 +8,7 @@ #include "base/lock.h" #include "base/logging.h" #include "base/ref_counted.h" +#include "base/scoped_ptr.h" #include "base/thread.h" #include "chrome/browser/chrome_thread.h" diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 101e0c2..3a25f71 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -5,6 +5,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "base/command_line.h" +#include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h index ae49a5c..261743d 100644 --- a/chrome/browser/net/chrome_url_request_context.h +++ b/chrome/browser/net/chrome_url_request_context.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_ #define CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_ +#include <string> +#include <vector> + #include "base/file_path.h" #include "base/linked_ptr.h" #include "net/base/cookie_monster.h" diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc index c58f394..1345aef 100644 --- a/chrome/browser/password_manager/password_store.cc +++ b/chrome/browser/password_manager/password_store.cc @@ -1,9 +1,10 @@ -// Copyright (c) 2006-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 "chrome/browser/password_manager/password_store.h" +#include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/chrome_thread.h" diff --git a/chrome/browser/sync/glue/database_model_worker_unittest.cc b/chrome/browser/sync/glue/database_model_worker_unittest.cc index 48866c4..666962c 100644 --- a/chrome/browser/sync/glue/database_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/database_model_worker_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/callback.h" +#include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/thread.h" #include "base/timer.h" @@ -23,7 +24,7 @@ class DatabaseModelWorkerTest : public testing::Test { did_do_work_(false), db_thread_(ChromeThread::DB), io_thread_(ChromeThread::IO, &io_loop_), - ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {}; + ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {} bool did_do_work() { return did_do_work_; } DatabaseModelWorker* worker() { return worker_.get(); } diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc index bcbd87c..a61832b 100644 --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc @@ -1,8 +1,9 @@ -// Copyright (c) 2006-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/callback.h" +#include "base/message_loop.h" #include "base/ref_counted.h" #include "base/thread.h" #include "chrome/browser/sync/engine/syncapi.h" diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index 14960a0..23bedb3 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -8,6 +8,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/ref_counted.h" +#include "base/scoped_ptr.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/file_watcher.h" #include "chrome/common/notification_observer.h" diff --git a/chrome/common/worker_thread_ticker.cc b/chrome/common/worker_thread_ticker.cc index 22b4aa2..452a9ff 100644 --- a/chrome/common/worker_thread_ticker.cc +++ b/chrome/common/worker_thread_ticker.cc @@ -1,4 +1,4 @@ -// 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. @@ -7,6 +7,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/message_loop.h" #include "base/task.h" #include "base/thread.h" diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index f0a6cd8..f68633e 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -1,4 +1,4 @@ -// 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. @@ -6,6 +6,7 @@ #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__ #include <string> +#include <vector> #include "app/message_box_flags.h" #include "base/basictypes.h" diff --git a/chrome/worker/nativewebworker_impl.cc b/chrome/worker/nativewebworker_impl.cc index bd3a993..3a5c73a 100644 --- a/chrome/worker/nativewebworker_impl.cc +++ b/chrome/worker/nativewebworker_impl.cc @@ -1,4 +1,4 @@ -// 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. @@ -9,6 +9,7 @@ #undef LOG #include "base/logging.h" +#include "base/message_loop.h" #include "base/thread.h" #include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc index 0726eff..8212413 100644 --- a/media/audio/linux/alsa_output.cc +++ b/media/audio/linux/alsa_output.cc @@ -78,6 +78,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/message_loop.h" #include "base/stl_util-inl.h" #include "base/time.h" #include "media/audio/audio_util.h" diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc index 598ca98..26237ca 100644 --- a/media/audio/linux/alsa_output_unittest.cc +++ b/media/audio/linux/alsa_output_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "base/message_loop.h" #include "base/string_util.h" #include "media/audio/linux/alsa_output.h" #include "media/audio/linux/alsa_wrapper.h" @@ -46,8 +47,8 @@ class MockAlsaWrapper : public AlsaWrapper { unsigned int rate, int soft_resample, unsigned int latency)); MOCK_METHOD1(PcmName, const char*(snd_pcm_t* handle)); - MOCK_METHOD1(PcmAvailUpdate, snd_pcm_sframes_t (snd_pcm_t* handle)); - MOCK_METHOD1(PcmState, snd_pcm_state_t (snd_pcm_t* handle)); + MOCK_METHOD1(PcmAvailUpdate, snd_pcm_sframes_t(snd_pcm_t* handle)); + MOCK_METHOD1(PcmState, snd_pcm_state_t(snd_pcm_t* handle)); MOCK_METHOD1(StrError, const char*(int errnum)); }; diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h index c79d319..32f09a8 100644 --- a/media/audio/linux/audio_manager_linux.h +++ b/media/audio/linux/audio_manager_linux.h @@ -1,4 +1,4 @@ -// 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. @@ -7,6 +7,7 @@ #include <map> +#include "base/lock.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/thread.h" diff --git a/net/proxy/single_threaded_proxy_resolver.cc b/net/proxy/single_threaded_proxy_resolver.cc index 81e3f1b..4009e2a 100644 --- a/net/proxy/single_threaded_proxy_resolver.cc +++ b/net/proxy/single_threaded_proxy_resolver.cc @@ -1,9 +1,10 @@ -// 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 "net/proxy/single_threaded_proxy_resolver.h" +#include "base/message_loop.h" #include "base/thread.h" #include "net/base/net_log.h" #include "net/base/net_errors.h" @@ -23,7 +24,7 @@ class PurgeMemoryTask : public base::RefCountedThreadSafe<PurgeMemoryTask> { ProxyResolver* resolver_; }; -} +} // namespace // SingleThreadedProxyResolver::SetPacScriptTask ------------------------------ @@ -240,7 +241,8 @@ int SingleThreadedProxyResolver::GetProxyForURL(const GURL& url, job->Start(); } else { // Otherwise the job will get started eventually by ProcessPendingJobs(). - job->net_log()->BeginEvent(NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD); + job->net_log()->BeginEvent( + NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD); } // Completion will be notified through |callback|, unless the caller cancels diff --git a/net/tools/hresolv/hresolv.cc b/net/tools/hresolv/hresolv.cc index f092703..0adc30a 100644 --- a/net/tools/hresolv/hresolv.cc +++ b/net/tools/hresolv/hresolv.cc @@ -1,4 +1,4 @@ -// 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. @@ -27,6 +27,7 @@ #include "base/condition_variable.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/message_loop.h" #include "base/string_util.h" #include "base/thread.h" #include "base/time.h" @@ -185,7 +186,7 @@ class DelayedResolve : public base::RefCounted<DelayedResolve> { invoker_(invoker), ALLOW_THIS_IN_INITIALIZER_LIST( io_callback_(this, &DelayedResolve::OnResolveComplete)) { - } + } void Start() { net::CompletionCallback* callback = (is_async_) ? &io_callback_ : NULL; |