Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / attestation / attestation_policy_browsertest.cc

diff --git a/src/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc b/src/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc
index 3364de9..11036ae 100644 (file)
--- a/src/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc
+++ b/src/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc
@@ -24,7 +24,7 @@ namespace policy {
 class CustomFakeCryptohomeClient : public chromeos::FakeCryptohomeClient {
  public:
   virtual void TpmAttestationIsEnrolled(
-      const chromeos::BoolDBusMethodCallback& callback) OVERRIDE {
+      const chromeos::BoolDBusMethodCallback& callback) override {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, chromeos::DBUS_METHOD_CALL_FAILURE, false));
@@ -36,15 +36,16 @@ class AttestationDevicePolicyTest
       public chromeos::DeviceSettingsService::Observer {
  public:
     // DeviceSettingsService::Observer
-    virtual void OwnershipStatusChanged() OVERRIDE {}
-    virtual void DeviceSettingsUpdated() OVERRIDE {
+    virtual void OwnershipStatusChanged() override {}
+    virtual void DeviceSettingsUpdated() override {
       operation_complete_ = true;
     }
+    virtual void OnDeviceSettingsServiceShutdown() override {}
 
  protected:
   AttestationDevicePolicyTest() : operation_complete_(false) {}
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
     InstallOwnerKey();
     RefreshDevicePolicy();