Implement Android key/value backup

chrome/browser/android/chrome_backup_agent_unittest.cc

Index: chrome/browser/android/chrome_backup_agent_unittest.cc
diff --git a/chrome/browser/android/chrome_backup_agent_unittest.cc b/chrome/browser/android/chrome_backup_agent_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5c46bdc9d05beb0aab831fb0d16d4a417e10995b
--- /dev/null
+++ b/chrome/browser/android/chrome_backup_agent_unittest.cc
@@ -0,0 +1,157 @@
+// Copyright 2015 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 <jni.h>
+
+#include <string>
+#include <vector>
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
+#include "base/values.h"
+#include "chrome/browser/android/chrome_backup_agent.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/chrome_constants.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/testing_profile_manager.h"
+#include "components/prefs/testing_pref_service.h"
+#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+// Declare the Java callable functions, can't include ChromeBackupAgent_jni.h
+// since we don't want to define anything here.

[Bernhard Bauer, 2016/11/14 10:05:39]

Ugh. Couldn't you just expose these functions from the chrome_backup_agent.h
(with a prefix of ...ForTesting)?

[aberent, 2016/11/14 17:23:40]

Done.

+extern "C" __attribute__((visibility("default"))) jobjectArray
+Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeGetBoolBackupNames(
+    JNIEnv* env,
+    jclass jcaller);
+extern "C" __attribute__((visibility("default"))) jbooleanArray
+Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeGetBoolBackupValues(
+    JNIEnv* env,
+    jclass jcaller);
+extern "C" __attribute__((visibility("default"))) void
+Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeSetBoolBackupPrefs(
+    JNIEnv* env,
+    jclass jcaller,
+    jobjectArray name,
+    jbooleanArray value);
+
+class ChromeBackupAgentTest : public ::testing::Test {
+ protected:
+  ChromeBackupAgentTest()
+      : expected_pref_names_(chrome::android::GetBackupPrefNames()),
+        testing_profile_manager_(TestingBrowserProcess::GetGlobal()),
+        env_(base::android::AttachCurrentThread()) {}
+
+  virtual void SetUp() {

[Bernhard Bauer, 2016/11/14 10:05:39]

override (and no virtual)?

[aberent, 2016/11/14 17:23:40]

Done.

+    ASSERT_TRUE(testing_profile_manager_.SetUp());
+    testing_profile_ =
+        testing_profile_manager_.CreateTestingProfile(chrome::kInitialProfile);
+    pref_service_ = testing_profile_->GetTestingPrefService();
+    registry_ = pref_service_->registry();
+    // Register one dummy pref for testing
+    registry_->RegisterBooleanPref("dummy", false);
+  }
+
+  content::TestBrowserThreadBundle thread_bundle_;
+  std::vector<std::string> expected_pref_names_;
+  TestingProfileManager testing_profile_manager_;
+  TestingProfile* testing_profile_;
+  sync_preferences::TestingPrefServiceSyncable* pref_service_;
+  PrefRegistrySimple* registry_;
+  JNIEnv* env_;
+};
+
+TEST_F(ChromeBackupAgentTest, GetBoolBackupNames) {
+  jobjectArray result =

[Bernhard Bauer, 2016/11/14 10:05:39]

Do you need to wrap this in a ScopedJavaLocalRef or something?

[aberent, 2016/11/14 17:23:40]

Done. There is a conversion from a JavaRef to a bare object, but it is going
away.

+      Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeGetBoolBackupNames(
+          env_, nullptr);
+  std::vector<std::string> pref_names;
+  base::android::AppendJavaStringArrayToStringVector(
+      base::android::AttachCurrentThread(), result, &pref_names);
+
+  EXPECT_EQ(expected_pref_names_, pref_names);
+}
+
+TEST_F(ChromeBackupAgentTest, GetBoolBackupValues_AllDefault) {
+  jbooleanArray result =
+      Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeGetBoolBackupValues(
+          env_, nullptr);
+  jsize size = env_->GetArrayLength(result);
+  ASSERT_EQ(expected_pref_names_.size(), (size_t)size);

[Bernhard Bauer, 2016/11/14 10:05:38]

static_cast<size_t>()

[aberent, 2016/11/14 17:23:40]

Done.

+
+  jboolean* values = env_->GetBooleanArrayElements(result, nullptr);
+  for (int i = 0; i < size; i++) {
+    bool expected_value;
+    ASSERT_TRUE(pref_service_->GetDefaultPrefValue(expected_pref_names_[i])
+                    ->GetAsBoolean(&expected_value));
+    EXPECT_EQ(expected_value, values[i]) << "i = " << i << ", "
+                                         << expected_pref_names_[i];
+  }
+}
+
+TEST_F(ChromeBackupAgentTest, GetBoolBackupValues_IrrelevantChange) {
+  // Try changing the dummy value, should make no difference
+  pref_service_->SetBoolean("dummy", true);
+  jbooleanArray result =
+      Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeGetBoolBackupValues(
+          env_, nullptr);
+  jsize size = env_->GetArrayLength(result);
+  ASSERT_EQ(expected_pref_names_.size(), (size_t)size);
+
+  jboolean* values = env_->GetBooleanArrayElements(result, nullptr);
+  for (int i = 0; i < size; i++) {
+    bool expected_value;
+    ASSERT_TRUE(pref_service_->GetDefaultPrefValue(expected_pref_names_[i])
+                    ->GetAsBoolean(&expected_value));
+    EXPECT_EQ(expected_value, values[i]) << "i = " << i << ", "
+                                         << expected_pref_names_[i];
+  }
+}
+
+TEST_F(ChromeBackupAgentTest, GetBoolBackupValues_RelevantChange) {
+  JNIEnv* env_ = base::android::AttachCurrentThread();

[Bernhard Bauer, 2016/11/14 10:05:38]

Unnecessary, I think.

[aberent, 2016/11/14 17:23:40]

Done.

+  // Change one of the values we care about
+  pref_service_->SetBoolean(expected_pref_names_[3], false);
+  jbooleanArray result =
+      Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeGetBoolBackupValues(
+          env_, nullptr);
+  jsize size = env_->GetArrayLength(result);
+  ASSERT_EQ(expected_pref_names_.size(), (size_t)size);
+
+  jboolean* values = env_->GetBooleanArrayElements(result, nullptr);
+  for (int i = 0; i < size; i++) {
+    if (i == 3)

[Bernhard Bauer, 2016/11/14 10:05:39]

I would maybe examine |expected_pref_names_| instead here (and then fold the
check outside of the loop into this).

[aberent, 2016/11/14 17:23:40]

Done.

+      continue;
+    bool expected_value;
+    ASSERT_TRUE(pref_service_->GetDefaultPrefValue(expected_pref_names_[i])
+                    ->GetAsBoolean(&expected_value));
+    EXPECT_EQ(expected_value, values[i]) << "i = " << i << ", "
+                                         << expected_pref_names_[i];
+  }
+  EXPECT_FALSE(values[3]) << "i = " << 3 << ", " << expected_pref_names_[3];
+}
+
+TEST_F(ChromeBackupAgentTest, SetBoolBackupValues) {
+  base::android::ScopedJavaLocalRef<jobjectArray> narray =
+      base::android::ToJavaArrayOfStrings(env_, expected_pref_names_);
+  jboolean* values = new jboolean[expected_pref_names_.size()];
+  for (size_t i = 0; i < expected_pref_names_.size(); i++) {
+    values[i] = false;
+  }
+  // Set a couple of the values to true.
+  values[5] = true;
+  values[8] = true;
+  jbooleanArray varray = env_->NewBooleanArray(expected_pref_names_.size());
+  env_->SetBooleanArrayRegion(varray, 0, expected_pref_names_.size(), values);
+  Java_org_chromium_chrome_browser_ChromeBackupAgent_nativeSetBoolBackupPrefs(
+      env_, nullptr, narray.obj(), varray);
+  for (size_t i = 0; i < expected_pref_names_.size(); i++) {
+    EXPECT_EQ((i == 5 || i == 8),

[Bernhard Bauer, 2016/11/14 10:05:39]

Just directly use values[i] here?

[aberent, 2016/11/14 17:23:40]

Done.

+              pref_service_->GetBoolean(expected_pref_names_[i]))
+        << "i = " << i << ", " << expected_pref_names_[i];
+  }
+  EXPECT_FALSE(pref_service_->GetBoolean("dummy"));
+}