Redesign the copresence audio handlers.

chrome/browser/extensions/api/copresence/copresence_translations.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 "chrome/browser/extensions/api/copresence/copresence_translations.h"
 
 #include "chrome/common/extensions/api/copresence.h"
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/enums.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
 
-using copresence::AUDIBLE;
+using copresence::AUDIO_CONFIGURATION_AUDIBLE;
 using copresence::AUDIO_CONFIGURATION_UNKNOWN;
 using copresence::BROADCAST_AND_SCAN;
 using copresence::BROADCAST_ONLY;
 using copresence::BROADCAST_SCAN_CONFIGURATION_UNKNOWN;
 using copresence::BroadcastScanConfiguration;
 using copresence::ReportRequest;
 using copresence::SCAN_ONLY;
 using copresence::TokenExchangeStrategy;
 
 using extensions::api::copresence::Strategy;
@@ skipping 27 matching lines @@
 // The strategy may be null (unspecified), so we pass it as a pointer.
 void SetTokenExchangeStrategy(const Strategy* strategy,
                               BroadcastScanConfiguration default_config,
                               TokenExchangeStrategy* strategy_proto) {
   if (strategy) {
     BroadcastScanConfiguration config = TranslateStrategy(*strategy);
     strategy_proto->set_broadcast_scan_configuration(
         config == BROADCAST_SCAN_CONFIGURATION_UNKNOWN ?
         default_config : config);
     strategy_proto->set_audio_configuration(
-        strategy->audible && *strategy->audible ?
-        AUDIBLE : AUDIO_CONFIGURATION_UNKNOWN);
+        strategy->audible && *strategy->audible ? AUDIO_CONFIGURATION_AUDIBLE
+                                                : AUDIO_CONFIGURATION_UNKNOWN);
   } else {
     strategy_proto->set_broadcast_scan_configuration(default_config);
     strategy_proto->set_audio_configuration(AUDIO_CONFIGURATION_UNKNOWN);
   }
 }
 
 }  // namespace
 
 namespace extensions {
 
@@ skipping 150 matching lines @@
                                    apps_by_subscription_id,
                                    request))
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace extensions