diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 17:01:40 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 17:01:40 +0000 |
| commit | 5f96bf3a7f495fe21e6a61b023a4a3659b3ec7e3 (patch) | |
| tree | e5e04ac2b29ef877b28c19a8372c99e420999d61 | |
| parent | 3aac77aeb279763357f07b9f0f15e6ad9c8fceb0 (diff) | |
| download | chromium_src-5f96bf3a7f495fe21e6a61b023a4a3659b3ec7e3.zip chromium_src-5f96bf3a7f495fe21e6a61b023a4a3659b3ec7e3.tar.gz chromium_src-5f96bf3a7f495fe21e6a61b023a4a3659b3ec7e3.tar.bz2 | |
Change NOTREACHED() to LOG(ERROR) when we cannot initialize
the web database. This is not a programming error. This
can happen if we run an old version of Chrome with a new
version of user data directory.
R=sky
BUG=none
TEST=N/A
Review URL: http://codereview.chromium.org/3418028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60480 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/webdata/web_data_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc index 43c6a5d..16cceac 100644 --- a/chrome/browser/webdata/web_data_service.cc +++ b/chrome/browser/webdata/web_data_service.cc @@ -549,13 +549,13 @@ void WebDataService::InitializeDatabaseIfNecessary() { return; // In the rare case where the db fails to initialize a dialog may get shown - // the blocks the caller, yet allows other messages through. For this reason + // that blocks the caller, yet allows other messages through. For this reason // we only set db_ to the created database if creation is successful. That // way other methods won't do anything as db_ is still NULL. WebDatabase* db = new WebDatabase(); sql::InitStatus init_status = db->Init(path_); if (init_status != sql::INIT_OK) { - NOTREACHED() << "Cannot initialize the web database"; + LOG(ERROR) << "Cannot initialize the web database: " << init_status; failed_init_ = true; delete db; if (main_loop_) { |