Manage MIDI related objects and sessions' lifecycles correctly

media/midi/midi_manager_usb_unittest.cc

 // Copyright 2014 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 "media/midi/midi_manager_usb.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 61 matching lines @@
 };
 
 class FakeMidiManagerClient : public MidiManagerClient {
  public:
   explicit FakeMidiManagerClient(Logger* logger)
       : complete_start_session_(false),
         result_(MIDI_NOT_SUPPORTED),
         logger_(logger) {}
   virtual ~FakeMidiManagerClient() {}
 
-  virtual void CompleteStartSession(int client_id, MidiResult result) override {
+  virtual void CompleteStartSession(MidiResult result) override {
     complete_start_session_ = true;
     result_ = result;
   }
 
   virtual void ReceiveMidiData(uint32 port_index,
                                const uint8* data,
                                size_t size,
                                double timestamp) override {
     logger_->AddLog("MidiManagerClient::ReceiveMidiData ");
     logger_->AddLog(base::StringPrintf("port_index = %d data =", port_index));
@@ skipping 61 matching lines @@
   virtual ~MidiManagerUsbTest() {
     std::string leftover_logs = logger_.TakeLog();
     if (!leftover_logs.empty()) {
       ADD_FAILURE() << "Log should be empty: " << leftover_logs;
     }
   }
 
  protected:
   void Initialize() {
     client_.reset(new FakeMidiManagerClient(&logger_));
-    manager_->StartSession(client_.get(), 0);
+    manager_->StartSession(client_.get());
   }
 
   void Finalize() {
     manager_->EndSession(client_.get());
   }
 
   bool IsInitializationCallbackInvoked() {
     return client_->complete_start_session_;
   }
 
@@ skipping 173 matching lines @@
             "data = 0x90 0x45 0x7f\n"
             "MidiManagerClient::ReceiveMidiData port_index = 0 "
             "data = 0xf0 0x00 0x01\n"
             "MidiManagerClient::ReceiveMidiData port_index = 0 data = 0xf7\n",
             logger_.TakeLog());
 }
 
 }  // namespace
 
 }  // namespace media