Fix syncing of oauth_client_id value for AppNotificationSettings

chrome/browser/sync/protocol/proto_value_conversions_unittest.cc

 // Copyright (c) 2011 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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ skipping 73 matching lines @@
   std::string password_value;
   EXPECT_TRUE(value->GetString("password_value", &password_value));
   EXPECT_EQ("<redacted>", password_value);
 }
 
 TEST_F(ProtoValueConversionsTest, AppNotificationSpecificsToValue) {
   TestSpecificsToValue(AppNotificationSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, AppSettingSpecificsToValue) {
-  TestSpecificsToValue(AppSettingSpecificsToValue);
+  sync_pb::AppNotificationSettings specifics;
+  specifics.set_disabled(true);
+  specifics.set_oauth_client_id("some_id_value");
+  scoped_ptr<DictionaryValue> value(AppSettingsToValue(specifics));
+  EXPECT_FALSE(value->empty());
+  bool disabled_value = false;
+  std::string oauth_client_id_value;
+  EXPECT_TRUE(value->GetBoolean("disabled", &disabled_value));
+  EXPECT_EQ(true, disabled_value);
+  EXPECT_TRUE(value->GetString("oauth_client_id", &oauth_client_id_value));
+  EXPECT_EQ("some_id_value", oauth_client_id_value);
 }
 
 TEST_F(ProtoValueConversionsTest, AppSpecificsToValue) {
   TestSpecificsToValue(AppSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, AutofillSpecificsToValue) {
   TestSpecificsToValue(AutofillSpecificsToValue);
 }
 
@@ skipping 67 matching lines @@
 
 #undef SET_EXTENSION
 
   scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(specifics));
   EXPECT_EQ(syncable::MODEL_TYPE_COUNT - syncable::FIRST_REAL_MODEL_TYPE,
             static_cast<int>(value->size()));
 }
 
 }  // namespace
 }  // namespace browser_sync