Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / apps / ephemeral_app_launcher_browsertest.cc

diff --git a/src/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc b/src/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc
index 0ecb803..6968440 100644 (file)
--- a/src/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc
+++ b/src/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc
@@ -58,10 +58,10 @@ class ExtensionInstallCheckerMock : public extensions::ExtensionInstallChecker {
       : extensions::ExtensionInstallChecker(profile),
         requirements_error_(requirements_error) {}
 
-  virtual ~ExtensionInstallCheckerMock() {}
+  ~ExtensionInstallCheckerMock() override {}
 
  private:
-  virtual void CheckRequirements() OVERRIDE {
+  void CheckRequirements() override {
     // Simulate an asynchronous operation.
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
@@ -103,8 +103,8 @@ class EphemeralAppLauncherForTest : public EphemeralAppLauncher {
  private:
   // Override necessary functions for testing.
 
-  virtual scoped_ptr<extensions::ExtensionInstallChecker> CreateInstallChecker()
-      OVERRIDE {
+  scoped_ptr<extensions::ExtensionInstallChecker> CreateInstallChecker()
+      override {
     if (requirements_check_error_.empty()) {
       return EphemeralAppLauncher::CreateInstallChecker();
     } else {
@@ -114,19 +114,19 @@ class EphemeralAppLauncherForTest : public EphemeralAppLauncher {
     }
   }
 
-  virtual scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() OVERRIDE {
+  scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() override {
     install_prompt_created_ = true;
     return EphemeralAppLauncher::CreateInstallUI();
   }
 
-  virtual scoped_ptr<extensions::WebstoreInstaller::Approval> CreateApproval()
-      const OVERRIDE {
+  scoped_ptr<extensions::WebstoreInstaller::Approval> CreateApproval()
+      const override {
     install_initiated_ = true;
     return EphemeralAppLauncher::CreateApproval();
   }
 
  private:
-  virtual ~EphemeralAppLauncherForTest() {}
+  ~EphemeralAppLauncherForTest() override {}
   friend class base::RefCountedThreadSafe<EphemeralAppLauncherForTest>;
 
   mutable bool install_initiated_;
@@ -174,12 +174,12 @@ class ManagementPolicyMock : public extensions::ManagementPolicy::Provider {
  public:
   ManagementPolicyMock() {}
 
-  virtual std::string GetDebugPolicyProviderName() const OVERRIDE {
+  std::string GetDebugPolicyProviderName() const override {
     return "ManagementPolicyMock";
   }
 
-  virtual bool UserMayLoad(const Extension* extension,
-                           base::string16* error) const OVERRIDE {
+  bool UserMayLoad(const Extension* extension,
+                   base::string16* error) const override {
     return false;
   }
 };
@@ -195,7 +195,7 @@ class EphemeralAppLauncherTest : public WebstoreInstallerTest {
                               kAppDomain,
                               kNonAppDomain) {}
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     WebstoreInstallerTest::SetUpCommandLine(command_line);
 
     // Make event pages get suspended immediately.
@@ -206,7 +206,7 @@ class EphemeralAppLauncherTest : public WebstoreInstallerTest {
     command_line->AppendSwitch(switches::kEnableEphemeralApps);
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  void SetUpOnMainThread() override {
     WebstoreInstallerTest::SetUpOnMainThread();
 
     // Disable ephemeral apps immediately after they stop running in tests.
@@ -304,7 +304,7 @@ class EphemeralAppLauncherTest : public WebstoreInstallerTest {
 
 class EphemeralAppLauncherTestDisabled : public EphemeralAppLauncherTest {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     // Skip EphemeralAppLauncherTest as it enables the feature.
     WebstoreInstallerTest::SetUpCommandLine(command_line);
   }
@@ -455,7 +455,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, BlockedByPolicy) {
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, BlacklistedForMalware) {
   // Mock a BLACKLISTED_MALWARE return status.
   extensions::TestBlacklist blacklist_tester(
-      ExtensionSystem::Get(profile())->blacklist());
+      extensions::Blacklist::Get(profile()));
   blacklist_tester.SetBlacklistState(
       kDefaultAppId, extensions::BLACKLISTED_MALWARE, false);
 
@@ -468,7 +468,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, BlacklistedForMalware) {
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, BlacklistStateUnknown) {
   // Mock a BLACKLISTED_MALWARE return status.
   extensions::TestBlacklist blacklist_tester(
-      ExtensionSystem::Get(profile())->blacklist());
+      extensions::Blacklist::Get(profile()));
   blacklist_tester.SetBlacklistState(
       kDefaultAppId, extensions::BLACKLISTED_UNKNOWN, false);