Rename WebDataServiceBackend to WebDatabaseBackend

components/webdata/common/web_database_backend.h

 // 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.
 
-#ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATA_SERVICE_BACKEND_H_
-#define COMPONENTS_WEBDATA_COMMON_WEB_DATA_SERVICE_BACKEND_H_
+#ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_BACKEND_H_
+#define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_BACKEND_H_
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_delete_on_message_loop.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "components/webdata/common/web_database_service.h"
 #include "components/webdata/common/webdata_export.h"
 
 class WebDatabase;
 class WebDatabaseTable;
 class WebDataRequest;
 class WebDataRequestManager;
 
 namespace tracked_objects {
 class Location;
 }
 
-// WebDataServiceBackend handles all database tasks posted by
+// WebDatabaseBackend handles all database tasks posted by
 // WebDatabaseService. It is refcounted to allow asynchronous destruction on the
 // DB thread.
 
 // TODO(caitkp): Rename this class to WebDatabaseBackend.

[Cait (Slow), 2015/03/11 14:49:27]

This TODO can be removed now :)

[zhuoyu.qian, 2015/03/12 01:50:09]

Done.

 
-class WEBDATA_EXPORT WebDataServiceBackend
-    : public base::RefCountedDeleteOnMessageLoop<WebDataServiceBackend> {
+class WEBDATA_EXPORT WebDatabaseBackend
+    : public base::RefCountedDeleteOnMessageLoop<WebDatabaseBackend> {
  public:
   class Delegate {
    public:
     virtual ~Delegate() {}
 
     // Invoked when the backend has finished loading the db.
     virtual void DBLoaded(sql::InitStatus status) = 0;
   };
 
-  WebDataServiceBackend(const base::FilePath& path,
-                        Delegate* delegate,
-                        const scoped_refptr<base::MessageLoopProxy>& db_thread);
+  WebDatabaseBackend(const base::FilePath& path,
+                     Delegate* delegate,
+                     const scoped_refptr<base::MessageLoopProxy>& db_thread);
 
   // 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 InitDatabase();
 
   // Opens the database file from the profile path if an init has not yet been
   // attempted. Separated from the constructor to ease construction/destruction
   // of this object on one thread but database access on the DB thread. Returns
   // the status of the database.
   sql::InitStatus LoadDatabaseIfNecessary();
 
   // Shuts down the database.
   void ShutdownDatabase();
 
   // Task wrappers to update requests and and notify |request_manager_|. These
   // are used in cases where the request is being made from the UI thread and an
   // asyncronous callback is required to notify the client of |request|'s
   // completion.
-  void DBWriteTaskWrapper(
-      const WebDatabaseService::WriteTask& task,
-      scoped_ptr<WebDataRequest> request);
-  void DBReadTaskWrapper(
-      const WebDatabaseService::ReadTask& task,
-      scoped_ptr<WebDataRequest> request);
+  void DBWriteTaskWrapper(const WebDatabaseService::WriteTask& task,
+                          scoped_ptr<WebDataRequest> request);
+  void DBReadTaskWrapper(const WebDatabaseService::ReadTask& task,
+                         scoped_ptr<WebDataRequest> request);
 
   // Task runners to run database tasks.
   void ExecuteWriteTask(const WebDatabaseService::WriteTask& task);
   scoped_ptr<WDTypedResult> ExecuteReadTask(
       const WebDatabaseService::ReadTask& task);
 
   const scoped_refptr<WebDataRequestManager>& request_manager() {
     return request_manager_;
   }
 
   WebDatabase* database() { return db_.get(); }
 
  protected:
-  friend class base::RefCountedDeleteOnMessageLoop<WebDataServiceBackend>;
-  friend class base::DeleteHelper<WebDataServiceBackend>;
+  friend class base::RefCountedDeleteOnMessageLoop<WebDatabaseBackend>;
+  friend class base::DeleteHelper<WebDatabaseBackend>;
 
-  virtual ~WebDataServiceBackend();
+  virtual ~WebDatabaseBackend();
 
  private:
   // Commit the current transaction.
   void Commit();
 
   // Path to database file.
   base::FilePath db_path_;
 
   // The tables that participate in managing the database. These are
   // owned here but other than that this class does nothing with
@@ skipping 14 matching lines @@
   // 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_;
 
   // Delegate. See the class definition above for more information.
   scoped_ptr<Delegate> delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebDataServiceBackend);
+  DISALLOW_COPY_AND_ASSIGN(WebDatabaseBackend);
 };
 
-#endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATA_SERVICE_BACKEND_H_
+#endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_BACKEND_H_