Move UI dependency from WebDataService to WebDataServiceFactory.

chrome/browser/webdata/web_data_service_base.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 "chrome/browser/api/webdata/web_data_service_base.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #ifdef DEBUG
 #include "content/public/browser/browser_thread.h"
 #endif
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataServiceBase implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
 
-WebDataServiceBase::WebDataServiceBase()
-    : db_loaded_(false) {
+WebDataServiceBase::WebDataServiceBase(const ProfileErrorCallback& callback)
+    : db_loaded_(false),
+      profile_error_callback_(callback) {
   // WebDataService requires DB thread if instantiated.
   // Set WebDataServiceFactory::GetInstance()->SetTestingFactory(&profile, NULL)
   // if you do not want to instantiate WebDataService in your test.
   DCHECK(BrowserThread::IsWellKnownThread(BrowserThread::DB));
 }
 
 void WebDataServiceBase::ShutdownOnUIThread() {
   db_loaded_ = false;
   ShutdownDatabase();
 }
@@ skipping 39 matching lines @@
   wdbs_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The following methods are executed on the DB thread.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataServiceBase::DBInitFailed(sql::InitStatus sql_status) {
-  ShowProfileErrorDialog(
-      (sql_status == sql::INIT_FAILURE) ?
-      IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
+  if (!profile_error_callback_.is_null())
+    profile_error_callback_.Run(sql_status);
 }
 
 void WebDataServiceBase::NotifyDatabaseLoadedOnUIThread() {
   db_loaded_ = true;
   // Notify that the database has been initialized.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_WEB_DATABASE_LOADED,
       content::Source<WebDataServiceBase>(this),
       content::NotificationService::NoDetails());
 }
 
 void WebDataServiceBase::DatabaseInitOnDB(sql::InitStatus status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (status == sql::INIT_OK) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WebDataServiceBase::NotifyDatabaseLoadedOnUIThread, this));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WebDataServiceBase::DBInitFailed, this, status));
   }
 }