Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / test / integration / passwords_helper.cc

diff --git a/src/chrome/browser/sync/test/integration/passwords_helper.cc b/src/chrome/browser/sync/test/integration/passwords_helper.cc
index 0dee0eb..ec0272b 100644 (file)
--- a/src/chrome/browser/sync/test/integration/passwords_helper.cc
+++ b/src/chrome/browser/sync/test/integration/passwords_helper.cc
@@ -16,10 +16,10 @@
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "components/password_manager/core/browser/password_form_data.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
+#include "content/public/test/test_utils.h"
 
 using autofill::PasswordForm;
 using password_manager::PasswordStore;
@@ -44,8 +44,8 @@ class PasswordStoreConsumerHelper
   explicit PasswordStoreConsumerHelper(std::vector<PasswordForm>* result)
       : password_manager::PasswordStoreConsumer(), result_(result) {}
 
-  virtual void OnGetPasswordStoreResults(
-      const std::vector<PasswordForm*>& result) OVERRIDE {
+  void OnGetPasswordStoreResults(
+      const std::vector<PasswordForm*>& result) override {
     result_->clear();
     for (std::vector<PasswordForm*>::const_iterator it = result.begin();
          it != result.end();
@@ -217,10 +217,10 @@ namespace {
 class SamePasswordFormsChecker : public MultiClientStatusChangeChecker {
  public:
   SamePasswordFormsChecker();
-  virtual ~SamePasswordFormsChecker();
+  ~SamePasswordFormsChecker() override;
 
-  virtual bool IsExitConditionSatisfied() OVERRIDE;
-  virtual std::string GetDebugMessage() const OVERRIDE;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
  private:
   bool in_progress_;
@@ -287,10 +287,10 @@ class SamePasswordFormsAsVerifierChecker
     : public SingleClientStatusChangeChecker {
  public:
   explicit SamePasswordFormsAsVerifierChecker(int index);
-  virtual ~SamePasswordFormsAsVerifierChecker();
+  ~SamePasswordFormsAsVerifierChecker() override;
 
-  virtual bool IsExitConditionSatisfied() OVERRIDE;
-  virtual std::string GetDebugMessage() const OVERRIDE;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
  private:
   int index_;