Pass app_locale directly to AutofillTable

chrome/browser/webdata/web_database_service.cc

 // Copyright 2013 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_database_service.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/api/webdata/web_data_results.h"
 #include "chrome/browser/api/webdata/web_data_service_consumer.h"
 #include "chrome/browser/webdata/web_data_request_manager.h"
 
 using base::Bind;
 using base::FilePath;
 using content::BrowserThread;
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataServiceBackend implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 // Refcounted to allow asynchronous destruction on the DB thread.
 class WebDataServiceBackend
     : public base::RefCountedThreadSafe<WebDataServiceBackend,
                                         BrowserThread::DeleteOnDBThread> {
  public:
-  explicit WebDataServiceBackend(
-      const FilePath& path, const std::string app_locale);
+  explicit WebDataServiceBackend(const FilePath& path);
 
   // Must call only before InitDatabaseWithCallback.
   void AddTable(scoped_ptr<WebDatabaseTable> table);
 
   // Initializes the database and notifies caller via callback when complete.
   // Callback is called synchronously.
   void InitDatabaseWithCallback(
       const WebDatabaseService::InitCallback& callback);
 
   // Opens the database file from the profile path if an init has not yet been
@@ skipping 48 matching lines @@
   scoped_refptr<WebDataRequestManager> request_manager_;
 
   // State of database initialization. Used to prevent the executing of tasks
   // before the db is ready.
   sql::InitStatus init_status_;
 
   // True if an attempt has been made to load the database (even if the attempt
   // fails), used to avoid continually trying to reinit if the db init fails.
   bool init_complete_;
 
-  // The application locale.  The locale is needed for some database migrations,
-  // and must be read on the UI thread.  It's cached here so that we can pass it
-  // to the migration code on the DB thread.
-  const std::string app_locale_;
-
   DISALLOW_COPY_AND_ASSIGN(WebDataServiceBackend);
 };
 
 WebDataServiceBackend::WebDataServiceBackend(
-    const FilePath& path,
-    const std::string app_locale)
+    const FilePath& path)
     : db_path_(path),
       request_manager_(new WebDataRequestManager()),
       init_status_(sql::INIT_FAILURE),
-      init_complete_(false),
-      app_locale_(app_locale) {
+      init_complete_(false) {
 }
 
 void WebDataServiceBackend::AddTable(scoped_ptr<WebDatabaseTable> table) {
   DCHECK(!db_.get());
   tables_.push_back(table.release());
 }
 
 void WebDataServiceBackend::InitDatabaseWithCallback(
     const WebDatabaseService::InitCallback& callback) {
   if (!callback.is_null()) {
     callback.Run(LoadDatabaseIfNecessary());
   }
 }
 
 sql::InitStatus WebDataServiceBackend::LoadDatabaseIfNecessary() {
   if (init_complete_ || db_path_.empty()) {
     return init_status_;
   }
   init_complete_ = true;
   db_.reset(new WebDatabase());
 
   for (ScopedVector<WebDatabaseTable>::iterator it = tables_.begin();
        it != tables_.end();
        ++it) {
     db_->AddTable(*it);
   }
 
-  init_status_ = db_->Init(db_path_, app_locale_);
+  init_status_ = db_->Init(db_path_);
   if (init_status_ != sql::INIT_OK) {
     LOG(ERROR) << "Cannot initialize the web database: " << init_status_;
     db_.reset(NULL);
     return init_status_;
   }
 
   db_->BeginTransaction();
   return init_status_;
 }
 
@@ skipping 37 matching lines @@
   if (db_ && init_status_ == sql::INIT_OK) {
     db_->CommitTransaction();
     db_->BeginTransaction();
   } else {
     NOTREACHED() << "Commit scheduled after Shutdown()";
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 WebDatabaseService::WebDatabaseService(
-    const base::FilePath& path,
-    const std::string app_locale)
-    : path_(path),
-      app_locale_(app_locale) {
+    const base::FilePath& path)
+    : path_(path) {
   // WebDatabaseService should be instantiated on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // WebDatabaseService requires DB thread if instantiated.
   DCHECK(BrowserThread::IsWellKnownThread(BrowserThread::DB));
 }
 
 WebDatabaseService::~WebDatabaseService() {
 }
 
 void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) {
   if (!wds_backend_) {
-    wds_backend_ = new WebDataServiceBackend(path_, app_locale_);
+    wds_backend_ = new WebDataServiceBackend(path_);
   }
   wds_backend_->AddTable(table.Pass());
 }
 
 void WebDatabaseService::LoadDatabase(const InitCallback& callback) {
   DCHECK(wds_backend_);
 
   BrowserThread::PostTask(
       BrowserThread::DB,
       FROM_HERE,
@@ skipping 61 matching lines @@
            task, base::Passed(&request)));
 
   return handle;
 }
 
 void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) {
   if (!wds_backend_)
     return;
   wds_backend_->request_manager()->CancelRequest(h);
 }