diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 22:24:18 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 22:24:18 +0000 |
| commit | 94c6eda7a6b36ae1e4f1050f69c23c960e67d923 (patch) | |
| tree | 98e905adc41b3d7f343eda1f0be049000a173a88 /webkit/fileapi/file_system_url_request_job_unittest.cc | |
| parent | 603220cd489cd6969b66e02ca9830f1121a14259 (diff) | |
| download | chromium_src-94c6eda7a6b36ae1e4f1050f69c23c960e67d923.zip chromium_src-94c6eda7a6b36ae1e4f1050f69c23c960e67d923.tar.gz chromium_src-94c6eda7a6b36ae1e4f1050f69c23c960e67d923.tar.bz2 | |
Broke CrOS; I can haz CrOS in default try jobs?
Revert 106139 - base::Bind: Convert FileSystemPathManager::GetRootPathCallback.
BUG=none
TEST=none
R=csilv@chromium.org
Review URL: http://codereview.chromium.org/8342008
TBR=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/8344023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_url_request_job_unittest.cc')
| -rw-r--r-- | webkit/fileapi/file_system_url_request_job_unittest.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index bd0ada8..33e0e7c 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -14,11 +14,10 @@ #include <string> -#include "base/bind.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/format_macros.h" -#include "base/memory/weak_ptr.h" +#include "base/memory/scoped_callback_factory.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" @@ -69,7 +68,7 @@ class FileSystemURLRequestJobTest : public testing::Test { protected: FileSystemURLRequestJobTest() : message_loop_(MessageLoop::TYPE_IO), // simulate an IO thread - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) { } virtual void SetUp() { @@ -90,8 +89,8 @@ class FileSystemURLRequestJobTest : public testing::Test { file_system_context_->path_manager()->ValidateFileSystemRootAndGetURL( GURL("http://remote/"), kFileSystemTypeTemporary, true, // create - base::Bind(&FileSystemURLRequestJobTest::OnGetRootPath, - weak_factory_.GetWeakPtr())); + callback_factory_.NewCallback( + &FileSystemURLRequestJobTest::OnGetRootPath)); MessageLoop::current()->RunAllPending(); net::URLRequest::Deprecated::RegisterProtocolFactory( @@ -203,7 +202,7 @@ class FileSystemURLRequestJobTest : public testing::Test { FilePath origin_root_path_; scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy_; scoped_refptr<FileSystemContext> file_system_context_; - base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_; + base::ScopedCallbackFactory<FileSystemURLRequestJobTest> callback_factory_; // NOTE: order matters, request must die before delegate scoped_ptr<TestDelegate> delegate_; |