Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / installer / util / installation_validator.h

diff --git a/src/chrome/installer/util/installation_validator.h b/src/chrome/installer/util/installation_validator.h
index 3dcc583..087824a 100644 (file)
--- a/src/chrome/installer/util/installation_validator.h
+++ b/src/chrome/installer/util/installation_validator.h
@@ -15,9 +15,8 @@
 #include "base/strings/string16.h"
 #include "chrome/installer/util/browser_distribution.h"
 
-class CommandLine;
-
 namespace base {
+class CommandLine;
 class FilePath;
 }
 
@@ -115,53 +114,53 @@ class InstallationValidator {
   // Validation rules for the Chrome browser.
   class ChromeRules : public ProductRules {
    public:
-    virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
+    virtual BrowserDistribution::Type distribution_type() const override;
     virtual void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
     virtual void AddRenameSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
-    virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
+    virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
   };
 
   // Validation rules for Chrome Frame.
   class ChromeFrameRules : public ProductRules {
    public:
-    virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
+    virtual BrowserDistribution::Type distribution_type() const override;
     virtual void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
     virtual void AddRenameSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
-    virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
+    virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
   };
 
   // Validation rules for Chrome App Host.
   class ChromeAppHostRules : public ProductRules {
    public:
-    virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
+    virtual BrowserDistribution::Type distribution_type() const override;
     virtual void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
     virtual void AddRenameSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
-    virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
+    virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
   };
 
   // Validation rules for the multi-install Chrome binaries.
   class ChromeBinariesRules : public ProductRules {
    public:
-    virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
+    virtual BrowserDistribution::Type distribution_type() const override;
     virtual void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
     virtual void AddRenameSwitchExpectations(
         const ProductContext& ctx,
-        SwitchExpectations* expectations) const OVERRIDE;
-    virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
+        SwitchExpectations* expectations) const override;
+    virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
   };
 
   struct ProductContext {
@@ -193,18 +192,6 @@ class InstallationValidator {
       const std::set<base::string16>& flags_expected,
       const base::string16& name,
       bool* is_valid);
-  static void ValidateInstallCommand(const ProductContext& ctx,
-                                     const AppCommand& app_cmd,
-                                     const wchar_t* expected_command,
-                                     const wchar_t* expected_app_name,
-                                     const char* expected_switch,
-                                     bool* is_valid);
-  static void ValidateInstallAppCommand(const ProductContext& ctx,
-                                        const AppCommand& app_cmd,
-                                        bool* is_valid);
-  static void ValidateInstallExtensionCommand(const ProductContext& ctx,
-                                              const AppCommand& app_cmd,
-                                              bool* is_valid);
   static void ValidateOnOsUpgradeCommand(const ProductContext& ctx,
                                          const AppCommand& app_cmd,
                                          bool* is_valid);
@@ -231,12 +218,12 @@ class InstallationValidator {
                                 const base::string16& purpose,
                                 bool* is_valid);
   static void ValidateCommandExpectations(const ProductContext& ctx,
-                                          const CommandLine& command,
+                                          const base::CommandLine& command,
                                           const SwitchExpectations& expected,
                                           const base::string16& source,
                                           bool* is_valid);
   static void ValidateUninstallCommand(const ProductContext& ctx,
-                                       const CommandLine& command,
+                                       const base::CommandLine& command,
                                        const base::string16& source,
                                        bool* is_valid);
   static void ValidateRenameCommand(const ProductContext& ctx,