Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions.

extensions/browser/value_store/value_store_frontend.cc

 // Copyright 2014 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 "extensions/browser/value_store/value_store_frontend.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/value_store/leveldb_value_store.h"
 
 using content::BrowserThread;
 
 class ValueStoreFrontend::Backend : public base::RefCountedThreadSafe<Backend> {
  public:
   Backend() : storage_(NULL) {}
 
   void Init(const base::FilePath& db_path) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     DCHECK(!storage_);
     TRACE_EVENT0("ValueStoreFrontend::Backend", "Init");
     db_path_ = db_path;
     storage_ = new LeveldbValueStore(db_path);
   }
 
   // This variant is useful for testing (using a mock ValueStore).
   void InitWithStore(scoped_ptr<ValueStore> storage) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     DCHECK(!storage_);
     storage_ = storage.release();
   }
 
   void Get(const std::string& key,
            const ValueStoreFrontend::ReadCallback& callback) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     ValueStore::ReadResult result = storage_->Get(key);
 
     // Extract the value from the ReadResult and pass ownership of it to the
     // callback.
     scoped_ptr<base::Value> value;
     if (!result->HasError()) {
       result->settings().RemoveWithoutPathExpansion(key, &value);
     } else {
       LOG(WARNING) << "Reading " << key << " from " << db_path_.value()
                    << " failed: " << result->error().message;
     }
 
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&ValueStoreFrontend::Backend::RunCallback,
                    this, callback, base::Passed(&value)));
   }
 
   void Set(const std::string& key, scoped_ptr<base::Value> value) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     // We don't need the old value, so skip generating changes.
     storage_->Set(ValueStore::IGNORE_QUOTA | ValueStore::NO_GENERATE_CHANGES,
                   key, *value.get());
   }
 
   void Remove(const std::string& key) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     storage_->Remove(key);
   }
 
  private:
   friend class base::RefCountedThreadSafe<Backend>;
 
   virtual ~Backend() {
     if (BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
       delete storage_;
     } else {
       BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE, storage_);
     }
   }
 
   void RunCallback(const ValueStoreFrontend::ReadCallback& callback,
                    scoped_ptr<base::Value> value) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     callback.Run(value.Pass());
   }
 
   // The actual ValueStore that handles persisting the data to disk. Used
   // exclusively on the FILE thread.
   ValueStore* storage_;
 
   base::FilePath db_path_;
 
   DISALLOW_COPY_AND_ASSIGN(Backend);
@@ skipping 43 matching lines @@
                  backend_, key, base::Passed(&value)));
 }
 
 void ValueStoreFrontend::Remove(const std::string& key) {
   DCHECK(CalledOnValidThread());
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&ValueStoreFrontend::Backend::Remove,
                  backend_, key));
 }