Fix WeakPtrFactory member ordering in content

content/renderer/pepper/pepper_plugin_instance_impl.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.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
 
 #include <list>
 #include <set>
 #include <string>
@@ skipping 534 matching lines @@
       bool use_shared_memory) OVERRIDE;
 
   // RenderFrameObserver
   virtual void OnDestruct() OVERRIDE;
 
   void AddLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
 
  private:
   friend class base::RefCounted<PepperPluginInstanceImpl>;
   friend class PpapiUnittest;
+  friend class PpapiPluginInstanceTest;

[Avi (use Gerrit), 2014/09/25 04:08:26]

Prefer alphabetical order; can you switch the two previous lines?

[MRV, 2014/09/25 04:37:17]

Done.

 
   // Delete should be called by the WebPlugin before this destructor.
   virtual ~PepperPluginInstanceImpl();
 
   // Class to record document load notifications and play them back once the
   // real document loader becomes available. Used only by external instances.
   class ExternalDocumentLoader : public blink::WebURLLoaderClient {
    public:
     ExternalDocumentLoader();
     virtual ~ExternalDocumentLoader();
@@ skipping 351 matching lines @@
   bool is_tracking_latency_;
 
   // We use a weak ptr factory for scheduling DidChangeView events so that we
   // can tell whether updates are pending and consolidate them. When there's
   // already a weak ptr pending (HasWeakPtrs is true), code should update the
   // view_data_ but not send updates. This also allows us to cancel scheduled
   // view change events.
   base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_;
   base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_;
 
-  friend class PpapiPluginInstanceTest;
   DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_