Revert 227566 "Fix some WeakPtrFactory members that aren't last"

ppapi/proxy/ppb_image_data_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 
 #include <string.h>  // For memcpy
 
 #include <map>
 #include <vector>
@@ skipping 231 matching lines @@
   void ImageDataUsable(ImageData* image_data);
 
   void DidDeleteInstance(PP_Instance instance);
 
  private:
   friend struct LeakySingletonTraits<ImageDataCache>;
 
   // Timer callback to expire entries for the given instance.
   void OnTimer(PP_Instance instance);
 
-  typedef std::map<PP_Instance, ImageDataInstanceCache> CacheMap;
-  CacheMap cache_;
-
   // This class does timer calls and we don't want to run these outside of the
   // scope of the object. Technically, since this class is a leaked static,
   // this will never happen and this factory is unnecessary. However, it's
   // probably better not to make assumptions about the lifetime of this class.
   base::WeakPtrFactory<ImageDataCache> weak_factory_;
 
+  typedef std::map<PP_Instance, ImageDataInstanceCache> CacheMap;
+  CacheMap cache_;
+
   DISALLOW_COPY_AND_ASSIGN(ImageDataCache);
 };
 
 // static
 ImageDataCache* ImageDataCache::GetInstance() {
   return Singleton<ImageDataCache,
                    LeakySingletonTraits<ImageDataCache> >::get();
 }
 
 scoped_refptr<ImageData> ImageDataCache::Get(
@@ skipping 427 matching lines @@
   // still cached in our process, the proxy still holds a reference so we can
   // remove the one the renderer just sent is. If the proxy no longer holds a
   // reference, we released everything and we should also release the one the
   // renderer just sent us.
   dispatcher()->Send(new PpapiHostMsg_PPBCore_ReleaseResource(
       API_ID_PPB_CORE, old_image_data));
 }
 
 }  // namespace proxy
 }  // namespace ppapi