Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / sandboxed_unpacker.h

diff --git a/src/chrome/browser/extensions/sandboxed_unpacker.h b/src/chrome/browser/extensions/sandboxed_unpacker.h
index 6f4075f..60a5bbd 100644 (file)
--- a/src/chrome/browser/extensions/sandboxed_unpacker.h
+++ b/src/chrome/browser/extensions/sandboxed_unpacker.h
@@ -44,7 +44,7 @@ class SandboxedUnpackerClient
                                const base::DictionaryValue* original_manifest,
                                const Extension* extension,
                                const SkBitmap& install_icon) = 0;
-  virtual void OnUnpackFailure(const string16& error) = 0;
+  virtual void OnUnpackFailure(const base::string16& error) = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<SandboxedUnpackerClient>;
@@ -78,12 +78,13 @@ class SandboxedUnpacker : public content::UtilityProcessHostClient {
   // Unpacks the extension in |crx_path| into a temporary directory and calls
   // |client| with the result. If |run_out_of_process| is provided, unpacking
   // is done in a sandboxed subprocess. Otherwise, it is done in-process.
-  SandboxedUnpacker(const base::FilePath& crx_path,
-                    Manifest::Location location,
-                    int creation_flags,
-                    const base::FilePath& extensions_dir,
-                    base::SequencedTaskRunner* unpacker_io_task_runner,
-                    SandboxedUnpackerClient* client);
+  SandboxedUnpacker(
+      const base::FilePath& crx_path,
+      Manifest::Location location,
+      int creation_flags,
+      const base::FilePath& extensions_dir,
+      const scoped_refptr<base::SequencedTaskRunner>& unpacker_io_task_runner,
+      SandboxedUnpackerClient* client);
 
   // Start unpacking the extension. The client is called with the results.
   void Start();
@@ -153,7 +154,7 @@ class SandboxedUnpacker : public content::UtilityProcessHostClient {
   friend class ProcessHostClient;
   friend class SandboxedUnpackerTest;
 
-  virtual ~SandboxedUnpacker();
+  ~SandboxedUnpacker() override;
 
   // Set |temp_dir_| as a temporary directory to unpack the extension in.
   // Return true on success.
@@ -174,14 +175,14 @@ class SandboxedUnpacker : public content::UtilityProcessHostClient {
   void StartProcessOnIOThread(const base::FilePath& temp_crx_path);
 
   // UtilityProcessHostClient
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnProcessCrashed(int exit_code) override;
 
   // IPC message handlers.
   void OnUnpackExtensionSucceeded(const base::DictionaryValue& manifest);
-  void OnUnpackExtensionFailed(const string16& error_message);
+  void OnUnpackExtensionFailed(const base::string16& error_message);
 
-  void ReportFailure(FailureReason reason, const string16& message);
+  void ReportFailure(FailureReason reason, const base::string16& message);
   void ReportSuccess(const base::DictionaryValue& original_manifest,
                      const SkBitmap& install_icon);