Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/public/test/mock_render_thread.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_PUBLIC_TEST_MOCK_RENDER_THREAD_H_
 #define CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_
 
 #include "base/memory/shared_memory.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
@@ skipping 67 matching lines @@
 #endif
   ServiceRegistry* GetServiceRegistry() override;
 
   //////////////////////////////////////////////////////////////////////////
   // The following functions are called by the test itself.
 
   void set_routing_id(int32 id) {
     routing_id_ = id;
   }
 
-  void set_surface_id(int32 id) {
-    surface_id_ = id;
-  }
-
   int32 opener_id() const {
     return opener_id_;
   }
 
   void set_new_window_routing_id(int32 id) {
     new_window_routing_id_ = id;
   }
 
   void set_new_frame_routing_id(int32 id) {
     new_frame_routing_id_ = id;
@@ skipping 10 matching lines @@
   base::ObserverList<RenderProcessObserver>& observers() { return observers_; }
 
  protected:
   // This function operates as a regular IPC listener. Subclasses
   // overriding this should first delegate to this implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
   // The Widget expects to be returned valid route_id.
   void OnCreateWidget(int opener_id,
                       blink::WebPopupType popup_type,
-                      int* route_id,
-                      int* surface_id);
+                      int* route_id);
 
   // The View expects to be returned a valid route_id different from its own.
   // We do not keep track of the newly created widget in MockRenderThread,
   // so it must be cleaned up on its own.
   void OnCreateWindow(
     const ViewHostMsg_CreateWindow_Params& params,
     int* route_id,
     int* main_frame_route_id,
-    int* surface_id,
     int64* cloned_session_storage_namespace_id);
 
   // The Frame expects to be returned a valid route_id different from its own.
   void OnCreateChildFrame(int new_frame_routing_id,
                           blink::WebTreeScopeType scope,
                           const std::string& frame_name,
                           blink::WebSandboxFlags sandbox_flags,
                           int* new_render_frame_id);
 
 #if defined(OS_WIN)
   void OnDuplicateSection(base::SharedMemoryHandle renderer_handle,
                           base::SharedMemoryHandle* browser_handle);
 #endif
 
   IPC::TestSink sink_;
 
   // Routing id what will be assigned to the Widget.
   int32 routing_id_;
 
-  // Surface id what will be assigned to the Widget.
-  int32 surface_id_;
-
   // Opener id reported by the Widget.
   int32 opener_id_;
 
   // Routing id that will be assigned to a CreateWindow Widget.
   int32 new_window_routing_id_;
   int32 new_window_main_frame_routing_id_;
   int32 new_frame_routing_id_;
 
   // The last known good deserializer for sync messages.
   scoped_ptr<IPC::MessageReplyDeserializer> reply_deserializer_;
 
   // A list of message filters added to this thread.
   std::vector<scoped_refptr<IPC::MessageFilter> > filters_;
 
   // Observers to notify.
   base::ObserverList<RenderProcessObserver> observers_;
 
   cc::TestSharedBitmapManager shared_bitmap_manager_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_