Media Galleries: Add more tests for media gallery names.

chrome/browser/media_gallery/scoped_mtp_device_map_entry.cc

 // 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.
 
 #include "chrome/browser/media_gallery/scoped_mtp_device_map_entry.h"
 
 #include "webkit/fileapi/media/mtp_device_file_system_config.h"
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/media_gallery/mtp_device_delegate_impl.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/media/mtp_device_map_service.h"
 #endif
 
 namespace chrome {
 
 namespace {
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
 bool IsMediaTaskRunnerThread() {
   base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
   base::SequencedWorkerPool::SequenceToken media_sequence_token =
       pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName);
   return pool->IsRunningSequenceOnCurrentThread(media_sequence_token);
 }
 
-base::SequencedTaskRunner* GetSequencedTaskRunner() {
+scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner() {

[Lei Zhang, 2012/12/20 01:33:55]

If I don't do this, I get a crash in debug mode:

FATAL:ref_counted.cc(74)] Check failed: !in_dtor_.

#0  base::debug::BreakDebugger() ../../base/debug/debugger_posix.cc:256
#1  logging::LogMessage::~LogMessage (this=0x7fffffffc5d0, __in_chrg=<optimized
out>) at ../../base/logging.cc:649
#2  base::subtle::RefCountedThreadSafeBase::AddRef (this=0x7fffe8ee0578) at
../../base/memory/ref_counted.cc:74
#3  base::RefCountedThreadSafe<base::TaskRunner, base::TaskRunnerTraits>::AddRef
(this=0x7fffe8ee0578) at ../../base/memory/ref_counted.h:137
#4  scoped_refptr<base::SequencedTaskRunner>::scoped_refptr
(this=0x7fffffffc830, p=0x7fffe8ee0570) at ../../base/memory/ref_counted.h:234
#5  chrome::ScopedMTPDeviceMapEntry::ScopedMTPDeviceMapEntry
(this=0x7fffe8ee0630, device_location="/mtp_bogus", on_destruction_callback=...)
at ../../chrome/browser/media_gallery/scoped_mtp_device_map_entry.cc:47

   base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
   base::SequencedWorkerPool::SequenceToken media_sequence_token =
       pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName);
   return pool->GetSequencedTaskRunner(media_sequence_token);
 }
 #endif
 
 }  // namespace
 
 ScopedMTPDeviceMapEntry::ScopedMTPDeviceMapEntry(
@@ skipping 24 matching lines @@
 void ScopedMTPDeviceMapEntry::OnMTPDeviceDelegateCreated(
     fileapi::MTPDeviceDelegate* delegate) {
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   DCHECK(IsMediaTaskRunnerThread());
   fileapi::MTPDeviceMapService::GetInstance()->AddDelegate(device_location_,
                                                            delegate);
 #endif
 }
 
 }  // namespace chrome