Cleaning up some tests

components/copresence/test/stub_whispernet_client.h

 // 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.
 
 #ifndef COMPONENTS_COPRESENCE_TEST_STUB_WHISPERNET_CLIENT_H_
 #define COMPONENTS_COPRESENCE_TEST_STUB_WHISPERNET_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "components/copresence/public/whispernet_client.h"
+#include "components/copresence/tokens.h"
+#include "media/base/audio_bus.h"
 
 namespace copresence {
 
 // A simple WhispernetClient for testing.
 class StubWhispernetClient final : public WhispernetClient {
  public:
-  // Constructor. The client can optionally be configured to respond
-  // as if Initialize() has completed. By default it does not.
-  explicit StubWhispernetClient(bool complete_initialization = false);
+  // Constructor. |samples| and |tokens|, if specified,
+  // will be returned for any encoding and decoding requests.
+  StubWhispernetClient(
+      scoped_refptr<media::AudioBusRefCounted> samples =
+          scoped_refptr<media::AudioBusRefCounted>(),
+      const std::vector<AudioToken>& tokens = std::vector<AudioToken>());
 
   ~StubWhispernetClient() override;
 
   void Initialize(const SuccessCallback& init_callback) override;
   void Shutdown() override {}
 
   void EncodeToken(const std::string& token, AudioType type) override;
   void DecodeSamples(AudioType type,
                      const std::string& samples,
                      const size_t token_length[2]) override;
   void DetectBroadcast() override {}
 
   void RegisterTokensCallback(const TokensCallback& tokens_cb) override;
   void RegisterSamplesCallback(const SamplesCallback& samples_cb) override;
   void RegisterDetectBroadcastCallback(
       const SuccessCallback& /* db_cb */) override {}
 
   TokensCallback GetTokensCallback() override;
   SamplesCallback GetSamplesCallback() override;
   SuccessCallback GetDetectBroadcastCallback() override;
   SuccessCallback GetInitializedCallback() override;
 
  private:
-  bool complete_initialization_;
   TokensCallback tokens_cb_;
   SamplesCallback samples_cb_;
+  scoped_refptr<media::AudioBusRefCounted> samples_;
   std::vector<AudioToken> tokens_;
-  scoped_refptr<media::AudioBusRefCounted> samples_;
 
   DISALLOW_COPY_AND_ASSIGN(StubWhispernetClient);
 };
 
 }  // namespace copresence
 
 #endif  // COMPONENTS_COPRESENCE_TEST_STUB_WHISPERNET_CLIENT_H_