| Index: remoting/protocol/jingle_session_manager.cc
|
| diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
|
| index e5e17bf01977d47df6cc7b4e12e8710c8348a49f..293a06f448cc3f7c88e30bac3abeb995f3137026 100644
|
| --- a/remoting/protocol/jingle_session_manager.cc
|
| +++ b/remoting/protocol/jingle_session_manager.cc
|
| @@ -359,7 +359,7 @@ bool JingleSessionManager::ParseContent(
|
| ChannelConfig channel_config;
|
| if (!ParseChannelConfig(child, false, &channel_config))
|
| return false;
|
| - config->AddControlConfig(channel_config);
|
| + config->mutable_control_configs()->push_back(channel_config);
|
| child = element->NextNamed(control_tag);
|
| }
|
|
|
| @@ -370,7 +370,7 @@ bool JingleSessionManager::ParseContent(
|
| ChannelConfig channel_config;
|
| if (!ParseChannelConfig(child, false, &channel_config))
|
| return false;
|
| - config->AddEventConfig(channel_config);
|
| + config->mutable_event_configs()->push_back(channel_config);
|
| child = element->NextNamed(event_tag);
|
| }
|
|
|
| @@ -381,7 +381,7 @@ bool JingleSessionManager::ParseContent(
|
| ChannelConfig channel_config;
|
| if (!ParseChannelConfig(child, true, &channel_config))
|
| return false;
|
| - config->AddVideoConfig(channel_config);
|
| + config->mutable_video_configs()->push_back(channel_config);
|
| child = element->NextNamed(video_tag);
|
| }
|
|
|
| @@ -402,7 +402,7 @@ bool JingleSessionManager::ParseContent(
|
| return false;
|
| }
|
|
|
| - config->SetInitialResolution(resolution);
|
| + *config->mutable_initial_resolution() = resolution;
|
|
|
| *content = new ContentDescription(config.release());
|
| return true;
|
|
|