Redesign the copresence audio handlers.

chrome/browser/extensions/api/copresence/copresence_api_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 "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
 #include "chrome/browser/extensions/extension_api_unittest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
 #include "components/copresence/public/copresence_manager.h"
 
 using base::ListValue;
-using copresence::AUDIBLE;
+using copresence::AUDIO_CONFIGURATION_AUDIBLE;
 using copresence::AUDIO_CONFIGURATION_UNKNOWN;
 using copresence::BROADCAST_ONLY;
 using copresence::CopresenceDelegate;
 using copresence::CopresenceManager;
 using copresence::FAIL;
 using copresence::PublishedMessage;
 using copresence::ReportRequest;
 using copresence::SCAN_ONLY;
 using copresence::Subscription;
 using google::protobuf::RepeatedPtrField;
@@ skipping 160 matching lines @@
   Subscription subscription;
   ASSERT_TRUE(GetOnly(
       request_sent().manage_subscriptions_request().subscription(),
       &subscription));
   EXPECT_EQ("sub", subscription.id());
   EXPECT_EQ(1000, subscription.ttl_millis());
   EXPECT_EQ("joke", subscription.message_type().type());
   copresence::BroadcastScanConfiguration broadcast_scan =
       subscription.token_exchange_strategy().broadcast_scan_configuration();
   EXPECT_EQ(BROADCAST_ONLY, broadcast_scan);
-  EXPECT_EQ(AUDIBLE,
+  EXPECT_EQ(AUDIO_CONFIGURATION_AUDIBLE,
             subscription.token_exchange_strategy().audio_configuration());
 }
 
 TEST_F(CopresenceApiUnittest, DefaultStrategies) {
   scoped_ptr<Operation> publish_operation(new Operation);
   publish_operation->publish.reset(CreatePublish("pub"));
 
   scoped_ptr<Operation> subscribe_operation(new Operation);
   subscribe_operation->subscribe.reset(CreateSubscribe("sub"));
 
@@ skipping 57 matching lines @@
 
 TEST_F(CopresenceApiUnittest, MultipleOperations) {
   scoped_ptr<Operation> multi_operation(new Operation);
   multi_operation->publish.reset(CreatePublish("pub"));
   multi_operation->subscribe.reset(CreateSubscribe("sub"));
 
   EXPECT_FALSE(ExecuteOperation(multi_operation.Pass()));
 }
 
 }  // namespace extensions