[M47_2526] Chromium upversion to m47_2526 branch

[platform/framework/web/chromium-efl.git] / tizen_src / ewk / efl_integration / browser / webdata / web_data_service_factory.cc

diff --git a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
index b09e564..1cd1beb 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
+++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
@@ -40,7 +40,7 @@ void InitSyncableServicesOnDBThread(
 }  // namespace
 
 WebDataServiceWrapper* WebDataServiceWrapper::GetInstance(){
-  return Singleton<WebDataServiceWrapper>::get();
+  return base::Singleton<WebDataServiceWrapper>::get();
 }
 
 WebDataServiceWrapper::WebDataServiceWrapper() {
@@ -48,23 +48,23 @@ WebDataServiceWrapper::WebDataServiceWrapper() {
   PathService::Get(PathsEfl::WEB_DATABASE_DIR, &db_path);
   base::FilePath path = db_path.Append(FILE_PATH_LITERAL(".FormData.db"));
 
-  scoped_refptr<base::MessageLoopProxy> ui_thread =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-  scoped_refptr<base::MessageLoopProxy> db_thread =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB);
-  web_database_ = new WebDatabaseService(path, ui_thread, db_thread);
+  web_database_ =
+    new WebDatabaseService(
+        path,
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB));
 
   // All tables objects that participate in managing the database must
   // be added here.
-  web_database_->AddTable(
-      scoped_ptr<WebDatabaseTable>(new autofill::AutofillTable(
-          EWebView::GetPlatformLocale())));
-
+  web_database_->AddTable(make_scoped_ptr(new autofill::AutofillTable));
   web_database_->LoadDatabase();
 
-  autofill_web_data_ = new AutofillWebDataService(
-      web_database_, ui_thread, db_thread, base::Bind(
-          &ProfileErrorCallback, 0));
+  autofill_web_data_ =
+    new AutofillWebDataService(
+        web_database_,
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+        base::Bind(&ProfileErrorCallback, 0));
   autofill_web_data_->Init();
 
   web_data_ = new WebDataService(
@@ -125,7 +125,7 @@ WebDataServiceFactory::GetAutofillWebDataForProfile() {
 
 // static
 WebDataServiceFactory* WebDataServiceFactory::GetInstance() {
-  return Singleton<WebDataServiceFactory>::get();
+  return base::Singleton<WebDataServiceFactory>::get();
 }
 
 #endif // TIZEN_AUTOFILL_SUPPORT