content/browser/appcache/appcache_database.cc - Issue 1991503002: [sql] sql::ScopedErrorIgnorer rename to sql::test::ScopedErrorExpecter

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/appcache/appcache_database.cc

Issue 1991503002: [sql] sql::ScopedErrorIgnorer rename to sql::test::ScopedErrorExpecter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: typo Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « components/password_manager/core/browser/affiliation_database_unittest.cc ('k') | content/browser/appcache/appcache_database_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "content/browser/appcache/appcache_database.h"	5 #include "content/browser/appcache/appcache_database.h"

6	6

7 #include "base/auto_reset.h"	7 #include "base/auto_reset.h"

8 #include "base/bind.h"	8 #include "base/bind.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/files/file_util.h"	10 #include "base/files/file_util.h"

(...skipping 1303 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1314 // So we can't go recursive.	1314 // So we can't go recursive.

1315 if (is_recreating_)	1315 if (is_recreating_)

1316 return false;	1316 return false;

1317	1317

1318 base::AutoReset<bool> auto_reset(&is_recreating_, true);	1318 base::AutoReset<bool> auto_reset(&is_recreating_, true);

1319 return LazyOpen(kCreateIfNeeded);	1319 return LazyOpen(kCreateIfNeeded);

1320 }	1320 }

1321	1321

1322 void AppCacheDatabase::OnDatabaseError(int err, sql::Statement* stmt) {	1322 void AppCacheDatabase::OnDatabaseError(int err, sql::Statement* stmt) {

1323 was_corruption_detected_ \|= sql::IsErrorCatastrophic(err);	1323 was_corruption_detected_ \|= sql::IsErrorCatastrophic(err);

1324 if (!db_->ShouldIgnoreSqliteError(err))	1324 if (!db_->IsExpectedSqliteError(err))

1325 DLOG(ERROR) << db_->GetErrorMessage();	1325 DLOG(ERROR) << db_->GetErrorMessage();

1326 // TODO: Maybe use non-catostrophic errors to trigger a full integrity check?	1326 // TODO: Maybe use non-catostrophic errors to trigger a full integrity check?

1327 }	1327 }

1328	1328

1329 } // namespace content	1329 } // namespace content

OLD	NEW