Make image_decoder a Leaky LazyInstance

chrome/common/chrome_utility_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Multiply-included message file, so no include guard.
 
 #if defined(OS_WIN)
 #include <Windows.h>
 #endif  // defined(OS_WIN)
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/tuple.h"
 #include "base/values.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
 // Singly-included section for typedefs.
 #ifndef CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
 #define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
 
+namespace chromeutility {
+  static const int DUMMY_IMAGE_DELEGATE_ID = -999;

[dcheng, 2015/02/27 16:47:18]

I think we should be looking into how to clean up the extensions code, rather
than adding a magic value for it.

[Theresa, 2015/03/04 03:10:07]

I agree, see webstore_install_helper.cc for thoughts.

+} // namespace chromeutility
+
 #if defined(OS_WIN)
 // A vector of filters, each being a Tuple containing a display string (i.e.
 // "Text Files") and a filter pattern (i.e. "*.txt").
 typedef std::vector<Tuple<base::string16, base::string16>>
     GetOpenFileNameFilter;
 #endif  // OS_WIN
 
 #endif  // CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
 
 #define IPC_MESSAGE_START ChromeUtilityMsgStart
@@ skipping 20 matching lines @@
 
 //------------------------------------------------------------------------------
 // Utility process messages:
 // These are messages from the browser to the utility process.
 
 // Tell the utility process to parse a JSON string into a Value object.
 IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_ParseJSON,
                      std::string /* JSON to parse */)
 
 // Tell the utility process to decode the given image data.
-IPC_MESSAGE_CONTROL2(ChromeUtilityMsg_DecodeImage,
+IPC_MESSAGE_CONTROL3(ChromeUtilityMsg_DecodeImage,
                      std::vector<unsigned char> /* encoded image contents */,
-                     bool /* shrink image if needed for IPC msg limit */)
+                     bool /* shrink image if needed for IPC msg limit */,
+                     int /* delegate id */)
 
 // Tell the utility process to decode the given JPEG image data with a robust
 // libjpeg codec.
-IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_RobustJPEGDecodeImage,
-                     std::vector<unsigned char>)  // encoded image contents
+IPC_MESSAGE_CONTROL2(ChromeUtilityMsg_RobustJPEGDecodeImage,
+                     std::vector<unsigned char> /* encoded image contents*/,
+                     int /* delegate id */)
 
 // Tell the utility process to patch the given |input_file| using |patch_file|
 // and place the output in |output_file|. The patch should use the bsdiff
 // algorithm (Courgette's version).
 IPC_MESSAGE_CONTROL3(ChromeUtilityMsg_PatchFileBsdiff,
                      base::FilePath /* input_file */,
                      base::FilePath /* patch_file */,
                      base::FilePath /* output_file */)
 
 // Tell the utility process to patch the given |input_file| using |patch_file|
@@ skipping 63 matching lines @@
 IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_ParseJSON_Failed,
                      std::string /* error message, if any*/)
 
 // Reply when the utility process has failed while unpacking and parsing a
 // web resource.  |error_message| is a user-readable explanation of what
 // went wrong.
 IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_UnpackWebResource_Failed,
                      std::string /* error_message, if any */)
 
 // Reply when the utility process has succeeded in decoding the image.
-IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_DecodeImage_Succeeded,
-                     SkBitmap)  // decoded image
+IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_DecodeImage_Succeeded,
+                     SkBitmap /* decoded image */,
+                     int /* delegate id */)
 
 // Reply when an error occurred decoding the image.
-IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_DecodeImage_Failed)
+IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_DecodeImage_Failed,
+                     int /* delegate id */)
 
 // Reply when a file has been patched.
 IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_PatchFile_Finished, int /* result */)
 
 #if defined(OS_CHROMEOS)
 // Reply when the utility process has succeeded in creating the zip file.
 IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_CreateZipFile_Succeeded)
 
 // Reply when an error occured in creating the zip file.
 IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_CreateZipFile_Failed)
@@ skipping 14 matching lines @@
 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetOpenFileName_Result,
                      base::FilePath /* directory */,
                      std::vector<base::FilePath> /* filenames */)
 IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_GetSaveFileName_Failed)
 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetSaveFileName_Result,
                      base::FilePath /* path */,
                      int /* one_based_filter_index  */)
 IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_BuildDirectWriteFontCache,
                      base::FilePath /* cache file path */)
 #endif  // defined(OS_WIN)