roll clang 131935:132017

ppapi/proxy/ppb_flash_file_proxy.cc

 // Copyright (c) 2011 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_flash_file_proxy.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 85 matching lines @@
     // These will be sent ASAP.
     std::vector<IPC::Message*> pre_connect_pending_messages_;
 
     // Holds the IDs of the sync messages we're currently waiting on for this
     // channel. This tracking allows us to cancel those requests if the
     // remote process crashes and we're cleaning up this filter (without just
     // deadlocking the waiting thread(s).
     std::set<int> pending_requests_for_filter_;
   };
 
-  virtual void SendFromIOThread(Dispatcher* dispatcher, IPC::Message* msg);
+  void SendFromIOThread(Dispatcher* dispatcher, IPC::Message* msg);
 
   // Internal version of OnModuleLocalMessageFailed which assumes the lock
   // is already held.
   void OnModuleLocalMessageFailedLocked(int message_id);
 
   base::Lock lock_;
 
   scoped_refptr<base::MessageLoopProxy> main_thread_;
 
   // Will be NULL before an instance routing is added.
@@ skipping 606 matching lines @@
 void PPB_Flash_File_FileRef_Proxy::OnMsgQueryFile(
     const HostResource& host_resource,
     PP_FileInfo_Dev* info,
     int32_t* result) {
   *result = ppb_flash_file_module_local_target()->
       QueryFile(host_resource.host_resource(), info);
 }
 
 }  // namespace proxy
 }  // namespace pp