Move UI dependency from WebDataService to WebDataServiceFactory.

chrome/browser/webdata/web_data_service_factory.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/webdata/web_data_service_factory.h"
 
+#include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/autofill_web_data_service_impl.h"
 #include "chrome/common/chrome_constants.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+
+namespace {
+
+// Callback to show error dialog on profile load error.
+void ProfileErrorCallback(sql::InitStatus status) {
+  ShowProfileErrorDialog(
+      (status == sql::INIT_FAILURE) ?
+      IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
+}
+
+}  // namespace
 
 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile){
   base::FilePath path = profile->GetPath();
   path = path.Append(chrome::kWebDataFilename);
-  web_data_service_ = new WebDataService();
+  web_data_service_ = new WebDataService(base::Bind(&ProfileErrorCallback));
   web_data_service_->Init(path);
 }
 
 // For testing.
 WebDataServiceWrapper::WebDataServiceWrapper() {
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {
   web_data_service_ = NULL;
 }
@@ skipping 84 matching lines @@
 }
 
 ProfileKeyedService*
 WebDataServiceFactory::BuildServiceInstanceFor(Profile* profile) const {
   return new WebDataServiceWrapper(profile);
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }