Offer user to send feedback from profile error dialog

components/history/core/browser/history_backend.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 "components/history/core/browser/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 50 matching lines @@
       DownloadDatabase (stores a list of downloads)
       VisitDatabase (stores a list of visits for the URLs)
       VisitSegmentDatabase (stores groups of URLs for the most visited view).
 
     ExpireHistoryBackend (manages deleting things older than 3 months)
 */
 
 namespace history {
 
 namespace {
+
 void RunUnlessCanceled(
     const base::Closure& closure,
     const base::CancelableTaskTracker::IsCanceledCallback& is_canceled) {
   if (!is_canceled.Run())
     closure.Run();
 }
+
+void NullErrorHandler(int error, sql::Statement* stmt) {
+  // Does nothing. Prevents DCHECKING on SQLITE errors on Debug builds.
+}
+
 }  // namespace
 
 // How long we'll wait to do a commit, so that things are batched together.
 const int kCommitIntervalSeconds = 10;
 
 // The amount of time before we re-fetch the favicon.
 const int kFaviconRefetchDays = 7;
 
 // The maximum number of items we'll allow in the redirect list before
 // deleting some.
@@ skipping 112 matching lines @@
 }
 
 // HistoryBackend --------------------------------------------------------------
 
 HistoryBackend::HistoryBackend(
     Delegate* delegate,
     std::unique_ptr<HistoryBackendClient> backend_client,
     scoped_refptr<base::SequencedTaskRunner> task_runner)
     : delegate_(delegate),
       scheduled_kill_db_(false),
+      error_callback_(base::Bind(&HistoryBackend::DatabaseErrorCallback,
+                                 base::Unretained(this))),
       expirer_(this, backend_client.get(), task_runner),
       recent_redirects_(kMaxRedirectCount),
       backend_destroy_message_loop_(nullptr),
       segment_queried_(false),
       backend_client_(std::move(backend_client)),
       task_runner_(task_runner) {}
 
 HistoryBackend::~HistoryBackend() {
   DCHECK(!scheduled_commit_) << "Deleting without cleanup";
   STLDeleteContainerPointers(queued_history_db_tasks_.begin(),
@@ skipping 422 matching lines @@
   base::FilePath thumbnail_name = GetFaviconsFileName();
 
   // Delete the old index database files which are no longer used.
   DeleteFTSIndexDatabases();
 
   // History database.
   db_.reset(new HistoryDatabase(
       history_database_params.download_interrupt_reason_none,
       history_database_params.download_interrupt_reason_crash));
 
-  // Unretained to avoid a ref loop with db_.
-  db_->set_error_callback(base::Bind(&HistoryBackend::DatabaseErrorCallback,
-                                     base::Unretained(this)));
+  db_->set_error_callback(error_callback_);
 
   sql::InitStatus status = db_->Init(history_name);
   switch (status) {
     case sql::INIT_OK:
       break;
-    case sql::INIT_TOO_NEW:
-      delegate_->NotifyProfileError(status);
-      db_.reset();
-      return;
     case sql::INIT_FAILURE: {
       // A null db_ will cause all calls on this object to notice this error
       // and to not continue. If the error callback scheduled killing the
       // database, the task it posted has not executed yet. Try killing the
       // database now before we close it.
       bool kill_db = scheduled_kill_db_;
       if (kill_db)
         KillHistoryDatabase();
       UMA_HISTOGRAM_BOOLEAN("History.AttemptedToFixProfileError", kill_db);
-      delegate_->NotifyProfileError(status);
+    }  // Falls through.
+    case sql::INIT_TOO_NEW: {
+      std::vector<base::FilePath::StringType> path_components;
+      history_name.GetComponents(&path_components);
+#if defined(OS_WIN)
+      const base::FilePath::StringType default_dir(L"Default");
+#else
+      const base::FilePath::StringType default_dir("Default");
+#endif  // defined(OS_WIN)
+
+      auto itr = std::find(path_components.begin(), path_components.end(),

[michaeln, 2016/07/12 20:05:32]

This test for default vs not a is probably not 100% accurate, we can probably
get rid of the conditional complilation, the last two path components should be
sufficient and should also not include PII 

history_name.DirName().AsUTF8Unsafe() + "/" +
    history_name.BaseName().AsUTF8Unsafe()

[afakhry, 2016/07/13 19:57:59]

I think you meant:

history_name.DirName().BaseName().AsUTF8Unsafe() + "/" +
history_name.BaseName().AsUTF8Unsafe();

Done.
Please note that in the case of a corruption in the user profile DB, the output
would be something like this:
Corrupted file: u-a900fbc60d7ae346b0250fb2b76d30b7f082618d/History

I suppose that hash value is not a PII.

+                           default_dir);
+      const std::string corrupted_file_name =
+          history_name.BaseName().AsUTF8Unsafe() + (itr != path_components.end()
+                                                        ? " [Default profile]"
+                                                        : " [User profile]");
+      db_diagnostics_["Corrupted file"] = corrupted_file_name;
+      delegate_->NotifyProfileError(status, db_diagnostics_);
       db_.reset();
       return;
     }
     default:
       NOTREACHED();
   }
 
   // Fill the in-memory database and send it back to the history service on the
   // main thread.
   {
@@ skipping 1720 matching lines @@
     // that we can delete all associated icons in the case of deleting an
     // unvisited bookmarked URL.
     if (visits.empty())
       expirer_.DeleteURL(*i);  // There are no more visits; nuke the URL.
   }
 }
 
 void HistoryBackend::DatabaseErrorCallback(int error, sql::Statement* stmt) {
   if (!scheduled_kill_db_ && sql::IsErrorCatastrophic(error)) {
     scheduled_kill_db_ = true;
+
+    // Gather diagnostic info, but prevent reentrant error callbacks.
+    db_->set_error_callback(base::Bind(&NullErrorHandler));
+    db_diagnostics_ = db_->GetDiagnosticMap();
+    db_->set_error_callback(error_callback_);
+
     // Don't just do the close/delete here, as we are being called by |db| and
     // that seems dangerous.
     // TODO(shess): Consider changing KillHistoryDatabase() to use
     // RazeAndClose().  Then it can be cleared immediately.
     task_runner_->PostTask(
         FROM_HERE, base::Bind(&HistoryBackend::KillHistoryDatabase, this));
   }
 }
 
 void HistoryBackend::KillHistoryDatabase() {
@@ skipping 200 matching lines @@
   // transaction is currently open.
   db_->CommitTransaction();
   db_->Vacuum();
   db_->BeginTransaction();
   db_->GetStartDate(&first_recorded_time_);
 
   return true;
 }
 
 }  // namespace history