Enable invalidations for supervised user settings on Android.

chrome/browser/sync/profile_sync_service_android_unittest.cc

Index: chrome/browser/sync/profile_sync_service_android_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_android_unittest.cc b/chrome/browser/sync/profile_sync_service_android_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..17df459be66ade4fddc71238e2517fcee4e9b84b
--- /dev/null
+++ b/chrome/browser/sync/profile_sync_service_android_unittest.cc
@@ -0,0 +1,102 @@
+// 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 <algorithm>
+#include <vector>
+
+#include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/strings/string_util.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/sync/profile_sync_components_factory_impl.h"
+#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/profile_sync_service_android.h"
+#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
+#include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
+#include "components/sync_driver/data_type_controller.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "sync/internal_api/public/base/model_type.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+int NumberOfSetBits(jlong bitmask) {
+  int num = 0;
+  while (bitmask > 0) {
+    num += (bitmask & 1);
+    bitmask >>= 1;
+  }
+  return num;
+}
+
+} // namespace
+
+class ProfileSyncServiceAndroidTest : public testing::Test {
+ public:
+  ProfileSyncServiceAndroidTest()
+      : command_line_(base::CommandLine::NO_PROGRAM) {}
+  virtual ~ProfileSyncServiceAndroidTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    ProfileOAuth2TokenService* token_service =
+        ProfileOAuth2TokenServiceFactory::GetForProfile(&profile_);
+    ProfileSyncComponentsFactory* factory =
+        new ProfileSyncComponentsFactoryImpl(
+            &profile_,
+            &command_line_,
+            GURL(),
+            token_service,
+            profile_.GetRequestContext());
+    sync_service_.reset(new ProfileSyncService(
+        make_scoped_ptr(factory),
+        &profile_,
+        scoped_ptr<SupervisedUserSigninManagerWrapper>(),
+        token_service,
+        browser_sync::MANUAL_START));
+    factory->RegisterDataTypes(sync_service_.get());
+  }
+
+ protected:
+  syncer::ModelTypeSet GetRegisteredDataTypes() {
+    sync_driver::DataTypeController::StateMap controller_states;
+    sync_service_->GetDataTypeControllerStates(&controller_states);
+    syncer::ModelTypeSet model_types;
+    for (sync_driver::DataTypeController::StateMap::const_iterator it =
+             controller_states.begin();
+         it != controller_states.end(); ++it) {
+      model_types.Put(it->first);
+    }
+    return model_types;
+  }
+
+ private:
+  base::CommandLine command_line_;
+  content::TestBrowserThreadBundle thread_bundle_;
+  TestingProfile profile_;
+  scoped_ptr<ProfileSyncService> sync_service_;
+};
+
+TEST_F(ProfileSyncServiceAndroidTest, ModelTypesToInvalidationNames) {
+  syncer::ModelTypeSet model_types = GetRegisteredDataTypes();

[Nicolas Zea, 2014/08/27 19:46:59]

nit: I think you can probably use syncer::ProtocolTypes() here instead of
GetRegisteredDataTypes. That way we catch datatypes that are still off by
default before they're turned on.

[Bernhard Bauer, 2014/08/27 20:46:12]

That's what I did initially, but the problem with that is that there are a lot
of data types that actually are turned off on Android, so I would have to
manually remove them.

+
+  jlong model_type_selection =
+      ProfileSyncServiceAndroid::ModelTypeSetToSelection(model_types);
+  // The number of set bits in the model type bitmask should be equal to the
+  // number of model types.
+  EXPECT_EQ(model_types.Size(), NumberOfSetBits(model_type_selection));
+
+  std::vector<std::string> invalidation_names;
+  for (syncer::ModelTypeSet::Iterator it = model_types.First(); it.Good();
+       it.Inc()) {
+    std::string notification_type;
+    if (syncer::RealModelTypeToNotificationType(it.Get(), &notification_type))
+      invalidation_names.push_back(notification_type);
+  }
+
+  std::sort(invalidation_names.begin(), invalidation_names.end());
+  EXPECT_EQ(JoinString(invalidation_names, ", "),
+            ProfileSyncServiceAndroid::ModelTypeSelectionToStringForTest(
+                model_type_selection));
+}