diff options
Diffstat (limited to 'remoting')
80 files changed, 161 insertions, 161 deletions
diff --git a/remoting/base/capture_data.h b/remoting/base/capture_data.h index 1922c9c..7169914 100644 --- a/remoting/base/capture_data.h +++ b/remoting/base/capture_data.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "media/base/video_frame.h" #include "remoting/base/types.h" diff --git a/remoting/base/codec_test.h b/remoting/base/codec_test.h index 613a537..40f02e2 100644 --- a/remoting/base/codec_test.h +++ b/remoting/base/codec_test.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_BASE_CODEC_TEST_H_ #define REMOTING_BASE_CODEC_TEST_H_ -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "media/base/video_frame.h" #include "remoting/base/capture_data.h" diff --git a/remoting/base/compound_buffer.h b/remoting/base/compound_buffer.h index cf92242..b07f40f 100644 --- a/remoting/base/compound_buffer.h +++ b/remoting/base/compound_buffer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -21,7 +21,7 @@ #include <deque> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "google/protobuf/io/zero_copy_stream.h" namespace net { diff --git a/remoting/base/compound_buffer_unittest.cc b/remoting/base/compound_buffer_unittest.cc index 2b90bfe..4889c0c 100644 --- a/remoting/base/compound_buffer_unittest.cc +++ b/remoting/base/compound_buffer_unittest.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <string> #include "base/callback.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/io_buffer.h" #include "remoting/base/compound_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/remoting/base/compressor_zlib.h b/remoting/base/compressor_zlib.h index 3371d22..ba959cf 100644 --- a/remoting/base/compressor_zlib.h +++ b/remoting/base/compressor_zlib.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_BASE_COMPRESSOR_ZLIB_H_ #define REMOTING_BASE_COMPRESSOR_ZLIB_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/compressor.h" typedef struct z_stream_s z_stream; diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h index bc55bd5..c82f242 100644 --- a/remoting/base/decoder.h +++ b/remoting/base/decoder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,8 +7,8 @@ #include <vector> +#include "base/memory/scoped_ptr.h" #include "base/task.h" -#include "base/scoped_ptr.h" #include "media/base/video_frame.h" #include "remoting/proto/video.pb.h" #include "ui/gfx/rect.h" diff --git a/remoting/base/decompressor_verbatim.h b/remoting/base/decompressor_verbatim.h index 1dfd2a2..ca712bf 100644 --- a/remoting/base/decompressor_verbatim.h +++ b/remoting/base/decompressor_verbatim.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_BASE_DECOMPRESSOR_VERBATIM_H_ #define REMOTING_BASE_DECOMPRESSOR_VERBATIM_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/decompressor.h" namespace remoting { diff --git a/remoting/base/decompressor_zlib.h b/remoting/base/decompressor_zlib.h index b5d122b..007672b 100644 --- a/remoting/base/decompressor_zlib.h +++ b/remoting/base/decompressor_zlib.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_BASE_DECOMPRESSOR_ZLIB_H_ #define REMOTING_BASE_DECOMPRESSOR_ZLIB_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/decompressor.h" typedef struct z_stream_s z_stream; diff --git a/remoting/base/tracer.cc b/remoting/base/tracer.cc index ba359d4..a48b582 100644 --- a/remoting/base/tracer.cc +++ b/remoting/base/tracer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/lazy_instance.h" +#include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/rand_util.h" -#include "base/ref_counted.h" #include "base/stl_util-inl.h" #include "base/synchronization/condition_variable.h" #include "base/threading/thread.h" diff --git a/remoting/base/tracer.h b/remoting/base/tracer.h index 2538d0e..0fcbdfa 100644 --- a/remoting/base/tracer.h +++ b/remoting/base/tracer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -53,11 +53,11 @@ #include <string> -#include "base/ref_counted.h" -#include "base/singleton.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/singleton.h" #include "base/synchronization/lock.h" #include "base/task.h" -#include "base/scoped_ptr.h" #include "remoting/proto/trace.pb.h" namespace remoting { diff --git a/remoting/client/chromoting_view.h b/remoting/client/chromoting_view.h index cf2fc5a..5dfd408 100644 --- a/remoting/client/chromoting_view.h +++ b/remoting/client/chromoting_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +7,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "media/base/video_frame.h" class MessageLoop; diff --git a/remoting/client/chromoting_view_unittest.cc b/remoting/client/chromoting_view_unittest.cc index a57962e..be1bf0b 100644 --- a/remoting/client/chromoting_view_unittest.cc +++ b/remoting/client/chromoting_view_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/decoder.h" #include "remoting/client/chromoting_view.h" #include "remoting/proto/internal.pb.h" diff --git a/remoting/client/client_util_unittest.cc b/remoting/client/client_util_unittest.cc index 2c5a2ad..cb1bba6 100644 --- a/remoting/client/client_util_unittest.cc +++ b/remoting/client/client_util_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/client/client_config.h" #include "remoting/client/client_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index f552777..44c4c18 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,7 +11,7 @@ #include <string> #include "base/gtest_prod_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_resource.h" diff --git a/remoting/client/plugin/chromoting_plugin_unittest.cc b/remoting/client/plugin/chromoting_plugin_unittest.cc index 30c6564..73d9b66 100644 --- a/remoting/client/plugin/chromoting_plugin_unittest.cc +++ b/remoting/client/plugin/chromoting_plugin_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/client/plugin/chromoting_plugin.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h index fcaee61..09ac054 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.h +++ b/remoting/client/plugin/chromoting_scriptable_object.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -76,7 +76,7 @@ #include <string> #include <vector> -#include "base/weak_ptr.h" +#include "base/memory/weak_ptr.h" #include "ppapi/cpp/dev/scriptable_object_deprecated.h" #include "ppapi/cpp/var.h" diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h index 2fb463a..28b3332 100644 --- a/remoting/client/plugin/pepper_view.h +++ b/remoting/client/plugin/pepper_view.h @@ -10,7 +10,7 @@ #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_VIEW_H_ #define REMOTING_CLIENT_PLUGIN_PEPPER_VIEW_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "media/base/video_frame.h" #include "ppapi/cpp/graphics_2d.h" diff --git a/remoting/client/plugin/pepper_view_proxy.h b/remoting/client/plugin/pepper_view_proxy.h index 3d12daa..f6212d3 100644 --- a/remoting/client/plugin/pepper_view_proxy.h +++ b/remoting/client/plugin/pepper_view_proxy.h @@ -16,7 +16,7 @@ #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_VIEW_PROXY_H_ #define REMOTING_CLIENT_PLUGIN_PEPPER_VIEW_PROXY_H_ -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "remoting/client/plugin/pepper_view.h" namespace remoting { diff --git a/remoting/client/plugin/pepper_xmpp_proxy.h b/remoting/client/plugin/pepper_xmpp_proxy.h index 4d4d6f3..e564c6c 100644 --- a/remoting/client/plugin/pepper_xmpp_proxy.h +++ b/remoting/client/plugin/pepper_xmpp_proxy.h @@ -5,7 +5,7 @@ #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_XMPP_PROXY_H_ #define REMOTING_CLIENT_PLUGIN_PEPPER_XMPP_PROXY_H_ -#include "base/weak_ptr.h" +#include "base/memory/weak_ptr.h" #include "remoting/jingle_glue/xmpp_proxy.h" namespace remoting { diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h index fbcc69b..3746e5f 100644 --- a/remoting/client/rectangle_update_decoder.h +++ b/remoting/client/rectangle_update_decoder.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H #define REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "media/base/video_frame.h" #include "remoting/base/decoder.h" diff --git a/remoting/client/x11_view.h b/remoting/client/x11_view.h index d3e9623..21b6438 100644 --- a/remoting/client/x11_view.h +++ b/remoting/client/x11_view.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_CLIENT_X11_VIEW_H_ #define REMOTING_CLIENT_X11_VIEW_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "media/base/video_frame.h" #include "remoting/base/decoder.h" // For UpdatedRects diff --git a/remoting/host/access_verifier_unittest.cc b/remoting/host/access_verifier_unittest.cc index ae0028b..1e1bebe 100644 --- a/remoting/host/access_verifier_unittest.cc +++ b/remoting/host/access_verifier_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/memory/ref_counted.h" #include "base/task.h" #include "remoting/host/access_verifier.h" #include "remoting/host/in_memory_host_config.h" diff --git a/remoting/host/capturer_fake.h b/remoting/host/capturer_fake.h index 97a7b74e..9eacc21 100644 --- a/remoting/host/capturer_fake.h +++ b/remoting/host/capturer_fake.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_HOST_CAPTURER_FAKE_H_ #define REMOTING_HOST_CAPTURER_FAKE_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_fake_ascii.h b/remoting/host/capturer_fake_ascii.h index e68b8b4..a07fb06 100644 --- a/remoting/host/capturer_fake_ascii.h +++ b/remoting/host/capturer_fake_ascii.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_HOST_CAPTURER_FAKE_ASCII_H_ #define REMOTING_HOST_CAPTURER_FAKE_ASCII_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_gdi.h b/remoting/host/capturer_gdi.h index 634520e..28f964b 100644 --- a/remoting/host/capturer_gdi.h +++ b/remoting/host/capturer_gdi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +7,7 @@ #include <windows.h> typedef HBITMAP BitmapRef; -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_linux.h b/remoting/host/capturer_linux.h index 8e8fcb3..15aa438 100644 --- a/remoting/host/capturer_linux.h +++ b/remoting/host/capturer_linux.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +6,7 @@ #define REMOTING_HOST_CAPTURER_LINUX_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_mac.h b/remoting/host/capturer_mac.h index 7ea8d99..442098d 100644 --- a/remoting/host/capturer_mac.h +++ b/remoting/host/capturer_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,7 +8,7 @@ #include "remoting/host/capturer.h" #include <ApplicationServices/ApplicationServices.h> #include <OpenGL/OpenGL.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace remoting { diff --git a/remoting/host/capturer_mac_unittest.cc b/remoting/host/capturer_mac_unittest.cc index bfa1786..cf4ef54 100644 --- a/remoting/host/capturer_mac_unittest.cc +++ b/remoting/host/capturer_mac_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +7,7 @@ #include <iostream> #include "base/callback.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/types.h" #include "remoting/host/capturer_mac.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h index f754c27..77efd3d 100644 --- a/remoting/host/chromoting_host.h +++ b/remoting/host/chromoting_host.h @@ -7,7 +7,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "remoting/base/encoder.h" #include "remoting/host/access_verifier.h" diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index f346e43..72cd5ba 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc @@ -4,7 +4,7 @@ #include "remoting/host/client_session.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "remoting/host/user_authenticator.h" #include "remoting/proto/auth.pb.h" diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h index 7d5846b..5517ea4 100644 --- a/remoting/host/desktop_environment.h +++ b/remoting/host/desktop_environment.h @@ -6,7 +6,7 @@ #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace remoting { diff --git a/remoting/host/differ.h b/remoting/host/differ.h index a5af54f..84555ee 100644 --- a/remoting/host/differ.h +++ b/remoting/host/differ.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/types.h" #include "ui/gfx/rect.h" diff --git a/remoting/host/differ_block_unittest.cc b/remoting/host/differ_block_unittest.cc index 6940fd2..ad91a87 100644 --- a/remoting/host/differ_block_unittest.cc +++ b/remoting/host/differ_block_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/memory/ref_counted.h" #include "remoting/host/differ_block.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/differ_unittest.cc b/remoting/host/differ_unittest.cc index 1728a73..8d78468 100644 --- a/remoting/host/differ_unittest.cc +++ b/remoting/host/differ_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/differ.h" #include "remoting/host/differ_block.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/event_executor_linux.h b/remoting/host/event_executor_linux.h index 8b61dd0..64ce94e 100644 --- a/remoting/host/event_executor_linux.h +++ b/remoting/host/event_executor_linux.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +9,7 @@ #include "base/task.h" #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/event_executor.h" #include "remoting/protocol/input_stub.h" diff --git a/remoting/host/event_executor_win.h b/remoting/host/event_executor_win.h index 1eebf33..9498319 100644 --- a/remoting/host/event_executor_win.h +++ b/remoting/host/event_executor_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +9,7 @@ #include "base/task.h" #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/event_executor.h" #include "remoting/protocol/input_stub.h" diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h index 089e040..1105179 100644 --- a/remoting/host/heartbeat_sender.h +++ b/remoting/host/heartbeat_sender.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,8 +7,8 @@ #include <string> -#include "base/scoped_ptr.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/host_key_pair.h" #include "remoting/jingle_glue/iq_request.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc index dded547..e02cc35 100644 --- a/remoting/host/heartbeat_sender_unittest.cc +++ b/remoting/host/heartbeat_sender_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/memory/ref_counted.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/ref_counted.h" #include "base/string_number_conversions.h" #include "remoting/base/constants.h" #include "remoting/host/heartbeat_sender.h" diff --git a/remoting/host/host_config.h b/remoting/host/host_config.h index bf62b7a..d9c1cd4 100644 --- a/remoting/host/host_config.h +++ b/remoting/host/host_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +7,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" class Task; diff --git a/remoting/host/host_key_pair.h b/remoting/host/host_key_pair.h index 2148739..b087e1f 100644 --- a/remoting/host/host_key_pair.h +++ b/remoting/host/host_key_pair.h @@ -7,8 +7,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" namespace base { diff --git a/remoting/host/host_key_pair_unittest.cc b/remoting/host/host_key_pair_unittest.cc index 6aa6d70..9ef1d5e 100644 --- a/remoting/host/host_key_pair_unittest.cc +++ b/remoting/host/host_key_pair_unittest.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <string> +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/ref_counted.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "remoting/host/host_key_pair.h" #include "remoting/host/json_host_config.h" diff --git a/remoting/host/in_memory_host_config.h b/remoting/host/in_memory_host_config.h index 998580a..e0a876d 100644 --- a/remoting/host/in_memory_host_config.h +++ b/remoting/host/in_memory_host_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,8 +7,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "remoting/host/host_config.h" diff --git a/remoting/host/json_host_config.h b/remoting/host/json_host_config.h index d9f233b..56ec01d 100644 --- a/remoting/host/json_host_config.h +++ b/remoting/host/json_host_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,8 +8,8 @@ #include <string> #include "base/file_path.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/in_memory_host_config.h" class DictionaryValue; diff --git a/remoting/host/json_host_config_unittest.cc b/remoting/host/json_host_config_unittest.cc index 20ea501..9a1893d 100644 --- a/remoting/host/json_host_config_unittest.cc +++ b/remoting/host/json_host_config_unittest.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/file_util.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/path_service.h" -#include "base/ref_counted.h" -#include "base/scoped_temp_dir.h" #include "remoting/host/json_host_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/remoting/host/keygen_main.cc b/remoting/host/keygen_main.cc index 88f363c..73b1aa2 100644 --- a/remoting/host/keygen_main.cc +++ b/remoting/host/keygen_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -14,7 +14,7 @@ #include "base/at_exit.h" #include "base/base64.h" #include "base/crypto/rsa_private_key.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" int main(int argc, char** argv) { base::AtExitManager exit_manager; diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc index b7d4d8f..543408e 100644 --- a/remoting/host/screen_recorder.cc +++ b/remoting/host/screen_recorder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/task.h" #include "base/time.h" diff --git a/remoting/host/screen_recorder.h b/remoting/host/screen_recorder.h index 2fa0fdc..da2dbf1 100644 --- a/remoting/host/screen_recorder.h +++ b/remoting/host/screen_recorder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,9 +8,9 @@ #include <vector> #include "base/basictypes.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/timer.h" #include "remoting/base/encoder.h" #include "remoting/host/capturer.h" diff --git a/remoting/host/x_server_pixel_buffer.h b/remoting/host/x_server_pixel_buffer.h index 98bb8f6..e27b9f7 100644 --- a/remoting/host/x_server_pixel_buffer.h +++ b/remoting/host/x_server_pixel_buffer.h @@ -7,8 +7,8 @@ #ifndef REMOTING_HOST_X_SERVER_PIXEL_BUFFER_H_ #define REMOTING_HOST_X_SERVER_PIXEL_BUFFER_H_ -#include "base/scoped_ptr.h" #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/rect.h" #include <X11/Xutil.h> diff --git a/remoting/jingle_glue/channel_socket_adapter_unittest.cc b/remoting/jingle_glue/channel_socket_adapter_unittest.cc index 867332f..885d308 100644 --- a/remoting/jingle_glue/channel_socket_adapter_unittest.cc +++ b/remoting/jingle_glue/channel_socket_adapter_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/socket/socket.h" diff --git a/remoting/jingle_glue/http_port_allocator.h b/remoting/jingle_glue/http_port_allocator.h index 8778d64..07aa830 100644 --- a/remoting/jingle_glue/http_port_allocator.h +++ b/remoting/jingle_glue/http_port_allocator.h @@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h" namespace remoting { diff --git a/remoting/jingle_glue/iq_request.cc b/remoting/jingle_glue/iq_request.cc index 3b9d574..f2751a9 100644 --- a/remoting/jingle_glue/iq_request.cc +++ b/remoting/jingle_glue/iq_request.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "remoting/jingle_glue/iq_request.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "third_party/libjingle/source/talk/p2p/base/sessionmanager.h" #include "third_party/libjingle/source/talk/xmpp/constants.h" diff --git a/remoting/jingle_glue/iq_request.h b/remoting/jingle_glue/iq_request.h index dcb142d..db85b96 100644 --- a/remoting/jingle_glue/iq_request.h +++ b/remoting/jingle_glue/iq_request.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" -#include "base/weak_ptr.h" +#include "base/memory/weak_ptr.h" #include "remoting/jingle_glue/xmpp_proxy.h" #include "third_party/libjingle/source/talk/base/sigslot.h" #include "third_party/libjingle/source/talk/xmpp/xmppengine.h" diff --git a/remoting/jingle_glue/iq_request_unittest.cc b/remoting/jingle_glue/iq_request_unittest.cc index 4e01fe3..9b17c76 100644 --- a/remoting/jingle_glue/iq_request_unittest.cc +++ b/remoting/jingle_glue/iq_request_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/memory/ref_counted.h" #include "base/string_util.h" #include "remoting/jingle_glue/iq_request.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/jingle_glue/jingle_client.h b/remoting/jingle_glue/jingle_client.h index 3a990df..851525e 100644 --- a/remoting/jingle_glue/jingle_client.h +++ b/remoting/jingle_glue/jingle_client.h @@ -8,7 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "remoting/jingle_glue/iq_request.h" #include "remoting/jingle_glue/xmpp_proxy.h" diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h index cda1886..1c778a8 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.h +++ b/remoting/jingle_glue/ssl_socket_adapter.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_ #define REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/remoting/jingle_glue/stream_socket_adapter.h b/remoting/jingle_glue/stream_socket_adapter.h index 942aa45..f9b274a 100644 --- a/remoting/jingle_glue/stream_socket_adapter.h +++ b/remoting/jingle_glue/stream_socket_adapter.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_JINGLE_GLUE_STREAM_SOCKET_ADAPTER_H_ #define REMOTING_JINGLE_GLUE_STREAM_SOCKET_ADAPTER_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/net_log.h" #include "net/socket/client_socket.h" #include "third_party/libjingle/source/talk/base/sigslot.h" diff --git a/remoting/jingle_glue/stream_socket_adapter_unittest.cc b/remoting/jingle_glue/stream_socket_adapter_unittest.cc index 3a7df0f..2d228db 100644 --- a/remoting/jingle_glue/stream_socket_adapter_unittest.cc +++ b/remoting/jingle_glue/stream_socket_adapter_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/socket/socket.h" diff --git a/remoting/jingle_glue/xmpp_proxy.h b/remoting/jingle_glue/xmpp_proxy.h index a2380fc..de2436a 100644 --- a/remoting/jingle_glue/xmpp_proxy.h +++ b/remoting/jingle_glue/xmpp_proxy.h @@ -16,8 +16,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/weak_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/weak_ptr.h" class MessageLoop; diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h index 1560b0f..1249080 100644 --- a/remoting/protocol/buffered_socket_writer.h +++ b/remoting/protocol/buffered_socket_writer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +7,7 @@ #include <list> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "net/base/io_buffer.h" #include "net/socket/socket.h" diff --git a/remoting/protocol/client_control_sender.h b/remoting/protocol/client_control_sender.h index cd039b8..08b8f82 100644 --- a/remoting/protocol/client_control_sender.h +++ b/remoting/protocol/client_control_sender.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,7 +13,7 @@ #define REMOTING_PROTOCOL_CLIENT_STUB_IMPL_H_ #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "remoting/protocol/client_stub.h" class Task; diff --git a/remoting/protocol/client_message_dispatcher.cc b/remoting/protocol/client_message_dispatcher.cc index 657e30d..a1020d2 100644 --- a/remoting/protocol/client_message_dispatcher.cc +++ b/remoting/protocol/client_message_dispatcher.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/memory/ref_counted.h" #include "net/base/io_buffer.h" #include "remoting/proto/control.pb.h" #include "remoting/proto/event.pb.h" diff --git a/remoting/protocol/client_message_dispatcher.h b/remoting/protocol/client_message_dispatcher.h index 88c7c14..1c9cbe4 100644 --- a/remoting/protocol/client_message_dispatcher.h +++ b/remoting/protocol/client_message_dispatcher.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +6,7 @@ #define REMOTING_PROTOCOL_CLIENT_MESSAGE_DISPATCHER_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "remoting/protocol/message_reader.h" diff --git a/remoting/protocol/connection_to_client.h b/remoting/protocol/connection_to_client.h index c9e4555..0196f84 100644 --- a/remoting/protocol/connection_to_client.h +++ b/remoting/protocol/connection_to_client.h @@ -8,9 +8,9 @@ #include <deque> #include <vector> +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "remoting/protocol/session.h" #include "remoting/protocol/video_writer.h" diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h index 886c702..183650e 100644 --- a/remoting/protocol/connection_to_host.h +++ b/remoting/protocol/connection_to_host.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,8 +7,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "remoting/jingle_glue/jingle_client.h" #include "remoting/proto/internal.pb.h" diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h index 3ffe20b..b5c69e0 100644 --- a/remoting/protocol/fake_session.h +++ b/remoting/protocol/fake_session.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/socket/socket.h" #include "remoting/protocol/session.h" diff --git a/remoting/protocol/host_control_sender.h b/remoting/protocol/host_control_sender.h index 148b519..2cce598 100644 --- a/remoting/protocol/host_control_sender.h +++ b/remoting/protocol/host_control_sender.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,7 +13,7 @@ #define REMOTING_PROTOCOL_HOST_STUB_IMPL_H_ #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "remoting/protocol/host_stub.h" class Task; diff --git a/remoting/protocol/host_message_dispatcher.cc b/remoting/protocol/host_message_dispatcher.cc index 9b1ee28..c4964e1 100644 --- a/remoting/protocol/host_message_dispatcher.cc +++ b/remoting/protocol/host_message_dispatcher.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/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/io_buffer.h" #include "remoting/proto/control.pb.h" #include "remoting/proto/event.pb.h" diff --git a/remoting/protocol/host_message_dispatcher.h b/remoting/protocol/host_message_dispatcher.h index 60afb27..5752f95 100644 --- a/remoting/protocol/host_message_dispatcher.h +++ b/remoting/protocol/host_message_dispatcher.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +6,7 @@ #define REMOTING_PROTOCOL_HOST_MESSAGE_DISPATCHER_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "remoting/protocol/message_reader.h" diff --git a/remoting/protocol/input_sender.h b/remoting/protocol/input_sender.h index cbbdb06..db7bd6d02 100644 --- a/remoting/protocol/input_sender.h +++ b/remoting/protocol/input_sender.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -14,7 +14,7 @@ #define REMOTING_PROTOCOL_INPUT_SENDER_H_ #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "remoting/protocol/input_stub.h" class Task; diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h index 29aae81..099dc4f6 100644 --- a/remoting/protocol/jingle_session.h +++ b/remoting/protocol/jingle_session.h @@ -6,7 +6,7 @@ #define REMOTING_PROTOCOL_JINGLE_SESSION_H_ #include "base/crypto/rsa_private_key.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/completion_callback.h" #include "remoting/protocol/session.h" #include "third_party/libjingle/source/talk/base/sigslot.h" diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h index 5cb0857..96f3cc9 100644 --- a/remoting/protocol/jingle_session_manager.h +++ b/remoting/protocol/jingle_session_manager.h @@ -8,7 +8,7 @@ #include <list> #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/x509_certificate.h" #include "remoting/protocol/jingle_session.h" #include "remoting/protocol/session_manager.h" diff --git a/remoting/protocol/message_decoder.h b/remoting/protocol/message_decoder.h index 0ba8b78..d1ecdcb 100644 --- a/remoting/protocol/message_decoder.h +++ b/remoting/protocol/message_decoder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,8 +8,8 @@ #include <deque> #include <list> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "net/base/io_buffer.h" #include "remoting/base/compound_buffer.h" #include "third_party/protobuf/src/google/protobuf/message_lite.h" diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc index c00d57d..97c31ff 100644 --- a/remoting/protocol/message_decoder_unittest.cc +++ b/remoting/protocol/message_decoder_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "remoting/proto/event.pb.h" diff --git a/remoting/protocol/message_reader.h b/remoting/protocol/message_reader.h index d14cb90..984cc1a 100644 --- a/remoting/protocol/message_reader.h +++ b/remoting/protocol/message_reader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,8 +6,8 @@ #define REMOTING_PROTOCOL_MESSAGE_READER_H_ #include "base/callback.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "net/base/completion_callback.h" #include "remoting/base/compound_buffer.h" diff --git a/remoting/protocol/protobuf_video_writer.h b/remoting/protocol/protobuf_video_writer.h index e288de1..aecefbc4 100644 --- a/remoting/protocol/protobuf_video_writer.h +++ b/remoting/protocol/protobuf_video_writer.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_ #define REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_ -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "remoting/protocol/video_writer.h" namespace remoting { diff --git a/remoting/protocol/rtp_reader.h b/remoting/protocol/rtp_reader.h index 915ac71..c2097b9 100644 --- a/remoting/protocol/rtp_reader.h +++ b/remoting/protocol/rtp_reader.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_PROTOCOL_RTP_READER_H_ #define REMOTING_PROTOCOL_RTP_READER_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/compound_buffer.h" #include "remoting/protocol/rtp_utils.h" #include "remoting/protocol/socket_reader_base.h" diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h index 9fd2fd3..0411de5 100644 --- a/remoting/protocol/session_manager.h +++ b/remoting/protocol/session_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -49,7 +49,7 @@ #include <string> #include "base/callback.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "remoting/protocol/session.h" class Task; diff --git a/remoting/protocol/session_manager_pair.h b/remoting/protocol/session_manager_pair.h index cc8b75c..cf86f62 100644 --- a/remoting/protocol/session_manager_pair.h +++ b/remoting/protocol/session_manager_pair.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,8 +10,8 @@ #ifndef REMOTING_PROTOCOL_MOCK_SESSION_MANAGER_H_ #define REMOTING_PROTOCOL_MOCK_SESSION_MANAGER_H_ -#include <base/ref_counted.h> -#include <base/scoped_ptr.h> +#include <base/memory/ref_counted.h> +#include <base/memory/scoped_ptr.h> #include "third_party/libjingle/source/talk/base/sigslot.h" diff --git a/remoting/protocol/socket_reader_base.h b/remoting/protocol/socket_reader_base.h index 5e366f8..63e4e81 100644 --- a/remoting/protocol/socket_reader_base.h +++ b/remoting/protocol/socket_reader_base.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 REMOTING_PROTOCOL_SOCKET_READER_BASE_H_ #define REMOTING_PROTOCOL_SOCKET_READER_BASE_H_ -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/completion_callback.h" namespace net { diff --git a/remoting/protocol/socket_wrapper.h b/remoting/protocol/socket_wrapper.h index 7176232..d67bc18 100644 --- a/remoting/protocol/socket_wrapper.h +++ b/remoting/protocol/socket_wrapper.h @@ -7,7 +7,7 @@ #ifndef REMOTING_PROTOCOL_SOCKET_WRAPPER_H_ #define REMOTING_PROTOCOL_SOCKET_WRAPPER_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/socket/socket.h" namespace remoting { |