summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 21:17:36 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 21:17:36 +0000
commitd3d6325dc3ae6f65cb8a5e8667b507938fcab332 (patch)
tree86ccde60258b15af95c01c9b488c8d03c06f0189 /remoting
parent92afac9f6a33689d471356eee7bef731c84d27c7 (diff)
downloadchromium_src-d3d6325dc3ae6f65cb8a5e8667b507938fcab332.zip
chromium_src-d3d6325dc3ae6f65cb8a5e8667b507938fcab332.tar.gz
chromium_src-d3d6325dc3ae6f65cb8a5e8667b507938fcab332.tar.bz2
base::Bind: Remove ScopedRunnableMethodFactory.
BUG=none TEST=none R=groby,awong,csilv Review URL: http://codereview.chromium.org/9071001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/base/scoped_thread_proxy.h8
-rw-r--r--remoting/protocol/jingle_session_manager.cc5
-rw-r--r--remoting/protocol/jingle_session_manager.h4
3 files changed, 7 insertions, 10 deletions
diff --git a/remoting/base/scoped_thread_proxy.h b/remoting/base/scoped_thread_proxy.h
index 2ec9b5b..9e43a15 100644
--- a/remoting/base/scoped_thread_proxy.h
+++ b/remoting/base/scoped_thread_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -15,9 +15,9 @@ namespace remoting {
// for a non-refcounted object. Must be deleted on the thread it
// belongs to.
//
-// The main difference from WeakPtr<> and ScopedRunnableMethodFactory<>
-// is that this class can be used safely to post tasks from different
-// threads.
+//
+// The main difference from WeakPtr<> is that this class can be used safely to
+// post tasks from different threads.
// It is similar to WeakHandle<> used in sync: the main difference is
// that WeakHandle<> creates closures itself, while ScopedThreadProxy
// accepts base::Closure instances which caller needs to create using
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 6a94a44..845a1d9 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -35,8 +35,7 @@ JingleSessionManager::JingleSessionManager(
allow_nat_traversal_(false),
ready_(false),
http_port_allocator_(NULL),
- closed_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {
+ closed_(false) {
}
JingleSessionManager::~JingleSessionManager() {
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
index 63f17b2..5424bf9 100644
--- a/remoting/protocol/jingle_session_manager.h
+++ b/remoting/protocol/jingle_session_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -116,8 +116,6 @@ class JingleSessionManager : public SessionManager,
std::list<JingleSession*> sessions_;
- ScopedRunnableMethodFactory<JingleSessionManager> task_factory_;
-
DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
};