commit 6f72f04ebdeb6d7d3344b3cb985a9d9f4390df2d
author amistry <amistry@chromium.org> Tue Apr 05 20:42:07 2016
committer Commit bot <commit-bot@chromium.org> Tue Apr 05 20:43:37 2016
tree 1092ec6a89d232cf7fbcb6499690535e8a8378d4
parent f368f9504083392dc3fbcf2a57418318115d72db

Convert the utility process image decoder into a Mojo service.

BUG=597124

Review URL: https://codereview.chromium.org/1844103004

Cr-Commit-Position: refs/heads/master@{#385278}

chrome/browser/image_decoder.h

diff --git a/chrome/browser/image_decoder.h b/chrome/browser/image_decoder.h
index f320426..e9c3526 100644
--- a/chrome/browser/image_decoder.h
+++ b/chrome/browser/image_decoder.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_IMAGE_DECODER_H_
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -18,6 +19,7 @@
 #include "base/synchronization/lock.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
+#include "chrome/common/image_decoder.mojom.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 
@@ -154,7 +156,11 @@
 
   // Calls StopBatchMode() after |kBatchModeTimeoutSeconds| have elapsed,
   // unless a new decoding request resets the timer.
-  scoped_ptr<base::DelayTimer> batch_mode_timer_;
+  std::unique_ptr<base::DelayTimer> batch_mode_timer_;
+
+  // Mojo service connection. Must always be bound/reset and used on the IO
+  // thread.
+  mojom::ImageDecoderPtr decoder_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDecoder);
 };