From d3d6325dc3ae6f65cb8a5e8667b507938fcab332 Mon Sep 17 00:00:00 2001 From: "jhawkins@chromium.org" Date: Tue, 3 Jan 2012 21:17:36 +0000 Subject: 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 --- webkit/appcache/appcache_update_job.cc | 5 ++--- webkit/appcache/appcache_update_job.h | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'webkit/appcache') diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc index 31dc325..7a68ca2 100644 --- a/webkit/appcache/appcache_update_job.cc +++ b/webkit/appcache/appcache_update_job.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. @@ -292,8 +292,7 @@ bool AppCacheUpdateJob::URLFetcher::MaybeRetryRequest() { AppCacheUpdateJob::AppCacheUpdateJob(AppCacheService* service, AppCacheGroup* group) - : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)), - service_(service), + : service_(service), group_(group), update_type_(UNKNOWN_TYPE), internal_state_(FETCH_MANIFEST), diff --git a/webkit/appcache/appcache_update_job.h b/webkit/appcache/appcache_update_job.h index 0f3905e..2fa660e5 100644 --- a/webkit/appcache/appcache_update_job.h +++ b/webkit/appcache/appcache_update_job.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. @@ -41,7 +41,6 @@ class APPCACHE_EXPORT AppCacheUpdateJob : public AppCacheStorage::Delegate, void StartUpdate(AppCacheHost* host, const GURL& new_master_resource); private: - friend class ScopedRunnableMethodFactory; friend class AppCacheUpdateJobTest; class URLFetcher; @@ -237,9 +236,6 @@ class APPCACHE_EXPORT AppCacheUpdateJob : public AppCacheStorage::Delegate, bool IsTerminating() { return internal_state_ >= REFETCH_MANIFEST || stored_state_ != UNSTORED; } - // This factory will be used to schedule invocations of various methods. - ScopedRunnableMethodFactory method_factory_; - GURL manifest_url_; // here for easier access AppCacheService* service_; -- cgit v1.1