Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / copresence / copresence_translations.cc

diff --git a/src/chrome/browser/extensions/api/copresence/copresence_translations.cc b/src/chrome/browser/extensions/api/copresence/copresence_translations.cc
index 5981939..5fecde2 100644 (file)
--- a/src/chrome/browser/extensions/api/copresence/copresence_translations.cc
+++ b/src/chrome/browser/extensions/api/copresence/copresence_translations.cc
@@ -9,6 +9,8 @@
 #include "components/copresence/proto/enums.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
 
+using copresence::AUDIBLE;
+using copresence::AUDIO_CONFIGURATION_UNKNOWN;
 using copresence::BROADCAST_AND_SCAN;
 using copresence::BROADCAST_ONLY;
 using copresence::BROADCAST_SCAN_CONFIGURATION_UNKNOWN;
@@ -54,9 +56,12 @@ void SetTokenExchangeStrategy(const Strategy* strategy,
     strategy_proto->set_broadcast_scan_configuration(
         config == BROADCAST_SCAN_CONFIGURATION_UNKNOWN ?
         default_config : config);
-    strategy_proto->set_use_audible(strategy->audible && *strategy->audible);
+    strategy_proto->set_audio_configuration(
+        strategy->audible && *strategy->audible ?
+        AUDIBLE : AUDIO_CONFIGURATION_UNKNOWN);
   } else {
     strategy_proto->set_broadcast_scan_configuration(default_config);
+    strategy_proto->set_audio_configuration(AUDIO_CONFIGURATION_UNKNOWN);
   }
 }
 
@@ -130,7 +135,7 @@ bool AddSubscribeToRequest(
     return false;
   }
 
-  // Convert from client to server subscription format.
+  // Convert from IDL to server subscription format.
   copresence::Subscription* subscription_proto =
       request->mutable_manage_subscriptions_request()->add_subscription();
   subscription_proto->set_id(subscription.id);
@@ -185,7 +190,7 @@ bool AddUnsubscribeToRequest(const std::string& app_id,
 }
 
 bool PrepareReportRequestProto(
-    const std::vector<linked_ptr<Operation> >& operations,
+    const std::vector<linked_ptr<Operation>>& operations,
     const std::string& app_id,
     SubscriptionToAppMap* apps_by_subscription_id,
     ReportRequest* request) {