Add new E2E sync multi profiles tests. This should not affect any existing

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

 // 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 "chrome/browser/sync/test/integration/bookmarks_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
+#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/history/core/browser/history_types.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/tree_node_iterator.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // History task which runs all pending tasks on the history thread and
 // signals when the tasks have completed.
@@ skipping 94 matching lines @@
   // |node_type| whose titles match |title|.
   int count = 0;
   while (iterator.has_next()) {
     const BookmarkNode* node = iterator.Next();
     if ((node->type() == node_type) && (node->GetTitle() == title))
       ++count;
   }
   return count;
 }
 
+// Returns the number of nodes of node type |node_type| in |model|.
+int CountNodes(BookmarkModel* model, BookmarkNode::Type node_type) {
+  ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
+  // Walk through the model tree looking for bookmark nodes of node type
+  // |node_type|.
+  int count = 0;
+  while (iterator.has_next()) {
+    const BookmarkNode* node = iterator.Next();
+    if (node->type() == node_type)
+      ++count;
+  }
+  return count;
+}
+
 // Checks if the favicon data in |bitmap_a| and |bitmap_b| are equivalent.
 // Returns true if they match.
 bool FaviconRawBitmapsMatch(const SkBitmap& bitmap_a,
                             const SkBitmap& bitmap_b) {
   if (bitmap_a.getSize() == 0U && bitmap_b.getSize() == 0U)
     return true;
   if ((bitmap_a.getSize() != bitmap_b.getSize()) ||
       (bitmap_a.width() != bitmap_b.width()) ||
       (bitmap_a.height() != bitmap_b.height())) {
     LOG(ERROR) << "Favicon size mismatch: " << bitmap_a.getSize() << " ("
@@ skipping 484 matching lines @@
       << "Node " << parent->GetTitle() << " does not belong to "
       << "Profile " << profile;
   int child_count = parent->child_count();
   if (child_count <= 0)
     return;
   for (int index = 0; index < child_count; ++index) {
     Move(profile, parent->GetChild(index), parent, child_count - index);
   }
 }
 
+void NotifyBookmarksSync(int profile) {

[pval...(no longer on Chromium), 2014/12/09 18:44:08]

Did you investigate using P2P invalidations instead of this way of forcing sync?
I think invalidations would be a cleaner way of doing this as we don't need to
write any more test hooks.

[shadi, 2014/12/10 18:10:10]

Yes, I looked into it; an observer_list destructor CHECK fails when creating a
new P2P invalidation service. In a nutshell, 
invalidation::ProfileInvalidationProviderFactory::GetInstance()->SetTestingFactoryAndUse(...)
in sync_test.cc calls ContextShutdown() on the profile created by the test. The
shutdown fails because of the observers attached to it because of the way we
create the profile (I think). 
https://code.google.com/p/chromium/codesearch#chromium/src/components/keyed_s...

I am not very familiar in how invalidations work, but reading the code it looks
like there could be only one invalidation service to use, either the default one
or the test one. A test one can be added using SetTestingFactoryAndUse()
function, and this is failing to happen...

[pval...(no longer on Chromium), 2014/12/11 19:24:52]

Thanks for the explanation here; it's very useful for future discussions.

Maybe add a TODO to use invalidations instead of force notifying?

[shadi, 2014/12/17 22:50:16]

Done.

+  const syncer::ModelTypeSet types(syncer::BOOKMARKS);
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
+      content::Source<Profile>(
+          sync_datatype_helper::test()->GetProfile(profile)),
+      content::Details<const syncer::ModelTypeSet>(&types));
+}
+
+void NotifyBookmarksSyncToAllProfiles() {
+  for (int i = 0; i < sync_datatype_helper::test()->num_clients(); ++i) {
+    NotifyBookmarksSync(i);
+  }
+}
+
 bool ModelMatchesVerifier(int profile) {
   if (!sync_datatype_helper::test()->use_verifier()) {
     LOG(ERROR) << "Illegal to call ModelMatchesVerifier() after "
                << "DisableVerifier(). Use ModelsMatch() instead.";
     return false;
   }
   return BookmarkModelsMatch(GetVerifierBookmarkModel(),
                              GetBookmarkModel(profile));
 }
 
@@ skipping 97 matching lines @@
 
 const BookmarkNode* GetUniqueNodeByURL(int profile, const GURL& url) {
   std::vector<const BookmarkNode*> nodes;
   GetBookmarkModel(profile)->GetNodesByURL(url, &nodes);
   EXPECT_EQ(1U, nodes.size());
   if (nodes.empty())
     return NULL;
   return nodes[0];
 }
 
+int CountAllBookmarks(int profile) {
+  return CountNodes(GetBookmarkModel(profile), BookmarkNode::URL);
+}
+
 int CountBookmarksWithTitlesMatching(int profile, const std::string& title) {
   return CountNodesWithTitlesMatching(GetBookmarkModel(profile),
                                       BookmarkNode::URL,
                                       base::UTF8ToUTF16(title));
 }
 
 int CountFoldersWithTitlesMatching(int profile, const std::string& title) {
   return CountNodesWithTitlesMatching(GetBookmarkModel(profile),
                                       BookmarkNode::FOLDER,
                                       base::UTF8ToUTF16(title));
@@ skipping 46 matching lines @@
 
 std::string IndexedSubfolderName(int i) {
   return base::StringPrintf("Subfolder Name %d", i);
 }
 
 std::string IndexedSubsubfolderName(int i) {
   return base::StringPrintf("Subsubfolder Name %d", i);
 }
 
 }  // namespace bookmarks_helper