Extend TwoClientExtensionSettingsSyncTest to test app settings.

chrome/browser/sync/test/integration/two_client_extension_settings_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_extension_settings_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_extension_settings_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extension_settings_sync_test.cc
deleted file mode 100644
index bd581dd6943da0bb69a764738f1d58d995d9e89a..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/test/integration/two_client_extension_settings_sync_test.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) 2012 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/stringprintf.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/integration/extension_settings_helper.h"
-#include "chrome/browser/sync/test/integration/extensions_helper.h"
-#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
-#include "chrome/browser/sync/test/integration/sync_test.h"
-
-namespace {
-
-using extension_settings_helper::SetExtensionSettings;
-using extension_settings_helper::SetExtensionSettingsForAllProfiles;
-using extension_settings_helper::AllExtensionSettingsSameAsVerifier;
-using extensions_helper::InstallExtension;
-using sync_datatype_helper::test;
-
-std::string InstallExtensionForAllProfiles(int index) {
-  for (int i = 0; i < test()->num_clients(); ++i)
-    InstallExtension(test()->GetProfile(i), index);
-  return InstallExtension(test()->verifier(), index);
-}
-
-// Generic mutations done after the initial setup of all tests. Note that
-// unfortuately we can't test existing configurations of the sync server since
-// the tests don't support that.
-void MutateSomeSettings(
-    int seed, // used to modify the mutation values, not keys.
-    const std::string& extension0,
-    const std::string& extension1,
-    const std::string& extension2) {
-  {
-    // Write to extension0 from profile 0 but not profile 1.
-    DictionaryValue settings;
-    settings.SetString("asdf", StringPrintf("asdfasdf-%d", seed));
-    SetExtensionSettings(test()->verifier(),    extension0, settings);
-    SetExtensionSettings(test()->GetProfile(0), extension0, settings);
-  }
-  {
-    // Write the same data to extension1 from both profiles.
-    DictionaryValue settings;
-    settings.SetString("asdf", StringPrintf("asdfasdf-%d", seed));
-    settings.SetString("qwer", StringPrintf("qwerqwer-%d", seed));
-    SetExtensionSettingsForAllProfiles(extension1, settings);
-  }
-  {
-    // Write different data to extension2 from each profile.
-    DictionaryValue settings0;
-    settings0.SetString("zxcv", StringPrintf("zxcvzxcv-%d", seed));
-    SetExtensionSettings(test()->verifier(),    extension2, settings0);
-    SetExtensionSettings(test()->GetProfile(0), extension2, settings0);
-
-    DictionaryValue settings1;
-    settings1.SetString("1324", StringPrintf("12341234-%d", seed));
-    settings1.SetString("5687", StringPrintf("56785678-%d", seed));
-    SetExtensionSettings(test()->verifier(),    extension2, settings1);
-    SetExtensionSettings(test()->GetProfile(1), extension2, settings1);
-  }
-}
-
-class TwoClientExtensionSettingsSyncTest : public SyncTest {
- public:
-  TwoClientExtensionSettingsSyncTest() : SyncTest(TWO_CLIENT) {}
-  virtual ~TwoClientExtensionSettingsSyncTest() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionSettingsSyncTest);
-};
-
-// For three independent extensions:
-//
-// Set up each extension with the same (but not necessarily empty) settings for
-// all profiles, start syncing, add some new settings, sync, mutate those
-// settings, sync.
-IN_PROC_BROWSER_TEST_F(TwoClientExtensionSettingsSyncTest,
-                       StartWithSameSettings) {
-  ASSERT_TRUE(SetupClients());
-
-  const std::string& extension0 = InstallExtensionForAllProfiles(0);
-  const std::string& extension1 = InstallExtensionForAllProfiles(1);
-  const std::string& extension2 = InstallExtensionForAllProfiles(2);
-
-  {
-    // Leave extension0 empty.
-  }
-  {
-    DictionaryValue settings;
-    settings.SetString("foo", "bar");
-    SetExtensionSettingsForAllProfiles(extension1, settings);
-  }
-  {
-    DictionaryValue settings;
-    settings.SetString("foo", "bar");
-    settings.SetString("baz", "qux");
-    SetExtensionSettingsForAllProfiles(extension2, settings);
-  }
-
-  ASSERT_TRUE(SetupSync());
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-
-  MutateSomeSettings(0, extension0, extension1, extension2);
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-
-  MutateSomeSettings(1, extension0, extension1, extension2);
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-}
-
-// For three independent extensions:
-//
-// Set up each extension with different settings for each profile, start
-// syncing, add some settings, sync, mutate those settings, sync, have a no-op
-// (non-)change to those settings, sync, mutate again, sync.
-IN_PROC_BROWSER_TEST_F(TwoClientExtensionSettingsSyncTest,
-                       StartWithDifferentSettings) {
-  ASSERT_TRUE(SetupClients());
-
-  const std::string& extension0 = InstallExtensionForAllProfiles(0);
-  const std::string& extension1 = InstallExtensionForAllProfiles(1);
-  const std::string& extension2 = InstallExtensionForAllProfiles(2);
-
-  {
-    // Leave extension0 empty again for no particular reason other than it's
-    // the only remaining unique combination given the other 2 tests have
-    // (empty, nonempty) and (nonempty, nonempty) configurations. We can't test
-    // (nonempty, nonempty) because the merging will provide unpredictable
-    // results, so test (empty, empty).
-  }
-  {
-    DictionaryValue settings;
-    settings.SetString("foo", "bar");
-    SetExtensionSettings(test()->verifier(), extension1, settings);
-    SetExtensionSettings(test()->GetProfile(0), extension1, settings);
-  }
-  {
-    DictionaryValue settings;
-    settings.SetString("foo", "bar");
-    settings.SetString("baz", "qux");
-    SetExtensionSettings(test()->verifier(), extension2, settings);
-    SetExtensionSettings(test()->GetProfile(1), extension2, settings);
-  }
-
-  ASSERT_TRUE(SetupSync());
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-
-  MutateSomeSettings(2, extension0, extension1, extension2);
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-
-  MutateSomeSettings(3, extension0, extension1, extension2);
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-
-  // Test a round of no-ops once, for sanity. Ideally we'd want to assert that
-  // this causes no sync activity, but that sounds tricky.
-  MutateSomeSettings(3, extension0, extension1, extension2);
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-
-  MutateSomeSettings(4, extension0, extension1, extension2);
-  ASSERT_TRUE(AwaitQuiescence());
-  ASSERT_TRUE(AllExtensionSettingsSameAsVerifier());
-}
-
-}  // namespace