Use leveldb_env::OpenDB() to open leveldb databases.

google_apis/gcm/engine/gcm_store_impl.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 "google_apis/gcm/engine/gcm_store_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 274 matching lines @@
 GCMStoreImpl::Backend::~Backend() {}
 
 LoadStatus GCMStoreImpl::Backend::OpenStoreAndLoadData(StoreOpenMode open_mode,
                                                        LoadResult* result) {
   LoadStatus load_status;
   if (db_.get()) {
     LOG(ERROR) << "Attempting to reload open database.";
     return RELOADING_OPEN_STORE;
   }
 
-  // Checks if the store exists or not. Calling DB::Open with create_if_missing
+  // Checks if the store exists or not. Opening a db with create_if_missing
   // not set will still create a new directory if the store does not exist.
   if (open_mode == DO_NOT_CREATE && !DatabaseExists(path_)) {
     DVLOG(2) << "Database " << path_.value() << " does not exist";
     return STORE_DOES_NOT_EXIST;
   }
 
   leveldb::Options options;
   options.create_if_missing = open_mode == CREATE_IF_MISSING;
   options.reuse_logs = leveldb_env::kDefaultLogReuseOptionValue;
   options.paranoid_checks = true;
-  leveldb::DB* db;
   leveldb::Status status =
-      leveldb::DB::Open(options, path_.AsUTF8Unsafe(), &db);
+      leveldb_env::OpenDB(options, path_.AsUTF8Unsafe(), &db_);
   UMA_HISTOGRAM_ENUMERATION("GCM.Database.Open",
                             leveldb_env::GetLevelDBStatusUMAValue(status),
                             leveldb_env::LEVELDB_STATUS_MAX);
   if (!status.ok()) {
     LOG(ERROR) << "Failed to open database " << path_.value() << ": "
                << status.ToString();
     return OPENING_STORE_FAILED;
   }
 
-  db_.reset(db);
   if (!LoadDeviceCredentials(&result->device_android_id,
                              &result->device_security_token)) {
     return LOADING_DEVICE_CREDENTIALS_FAILED;
   }
   if (!LoadRegistrations(&result->registrations))
     return LOADING_REGISTRATION_FAILED;
   if (!LoadIncomingMessages(&result->incoming_messages))
     return LOADING_INCOMING_MESSAGES_FAILED;
   if (!LoadOutgoingMessages(&result->outgoing_messages))
     return LOADING_OUTGOING_MESSAGES_FAILED;
@@ skipping 1152 matching lines @@
            removed_message_counts.begin();
        iter != removed_message_counts.end(); ++iter) {
     DCHECK_NE(app_message_counts_.count(iter->first), 0U);
     app_message_counts_[iter->first] -= iter->second;
     DCHECK_GE(app_message_counts_[iter->first], 0);
   }
   callback.Run(true);
 }
 
 }  // namespace gcm