Allow sync integration tests to operate on multiple datatypes: Apps, Extensions, Themes

chrome/test/live_sync/sync_extension_helper.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.
 
-#include "chrome/test/live_sync/live_sync_extension_helper.h"
+#include "chrome/test/live_sync/sync_extension_helper.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/test/live_sync/live_sync_test.h"
+#include "chrome/test/live_sync/sync_datatype_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-LiveSyncExtensionHelper::ExtensionState::ExtensionState()
+SyncExtensionHelper::ExtensionState::ExtensionState()
     : enabled_state(ENABLED), incognito_enabled(false) {}
 
-LiveSyncExtensionHelper::ExtensionState::~ExtensionState() {}
+SyncExtensionHelper::ExtensionState::~ExtensionState() {}
 
-bool LiveSyncExtensionHelper::ExtensionState::Equals(
-    const LiveSyncExtensionHelper::ExtensionState &other) const {
+bool SyncExtensionHelper::ExtensionState::Equals(
+    const SyncExtensionHelper::ExtensionState &other) const {
   return ((enabled_state == other.enabled_state) &&
           (incognito_enabled == other.incognito_enabled));
 }
 
-LiveSyncExtensionHelper::LiveSyncExtensionHelper() {}
+// static
+SyncExtensionHelper* SyncExtensionHelper::GetInstance() {
+  SyncExtensionHelper* instance = Singleton<SyncExtensionHelper>::get();
+  instance->SetupIfNecessary(sync_datatype_helper::test());
+  return instance;
+}
 
-LiveSyncExtensionHelper::~LiveSyncExtensionHelper() {}
+SyncExtensionHelper::SyncExtensionHelper() : setup_completed_(false) {}
+
+SyncExtensionHelper::~SyncExtensionHelper() {}
 
 // static
-std::string LiveSyncExtensionHelper::NameToId(const std::string& name) {
+std::string SyncExtensionHelper::NameToId(const std::string& name) {
   std::string id;
   EXPECT_TRUE(Extension::GenerateId(name, &id));
   return id;
 }
 
-void LiveSyncExtensionHelper::Setup(LiveSyncTest* test) {
+void SyncExtensionHelper::SetupIfNecessary(LiveSyncTest* test) {
+  if (setup_completed_)
+    return;
+
   for (int i = 0; i < test->num_clients(); ++i) {
     SetupProfile(test->GetProfile(i));
   }
   SetupProfile(test->verifier());
+
+  setup_completed_ = true;
 }
 
-void LiveSyncExtensionHelper::InstallExtension(
+void SyncExtensionHelper::InstallExtension(
     Profile* profile, const std::string& name, Extension::Type type) {
   scoped_refptr<Extension> extension = GetExtension(profile, name, type);
   ASSERT_TRUE(extension.get()) << "Could not get extension " << name
                                << " (profile = " << profile << ")";
   profile->GetExtensionService()->OnExtensionInstalled(
       extension, extension->UpdatesFromGallery());
 }
 
-void LiveSyncExtensionHelper::UninstallExtension(
+void SyncExtensionHelper::UninstallExtension(
     Profile* profile, const std::string& name) {
   ExtensionService::UninstallExtensionHelper(profile->GetExtensionService(),
                                              NameToId(name));
 }
 
-std::vector<std::string> LiveSyncExtensionHelper::GetInstalledExtensionNames(
+std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames(
     Profile* profile) const {
   std::vector<std::string> names;
   ExtensionService* extension_service = profile->GetExtensionService();
 
   const ExtensionList* extensions = extension_service->extensions();
   for (ExtensionList::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
   const ExtensionList* disabled_extensions =
       extension_service->disabled_extensions();
   for (ExtensionList::const_iterator it = disabled_extensions->begin();
        it != disabled_extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
   const ExtensionList* terminated_extensions =
       extension_service->terminated_extensions();
   for (ExtensionList::const_iterator it = terminated_extensions->begin();
        it != terminated_extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
   return names;
 }
 
-void LiveSyncExtensionHelper::EnableExtension(Profile* profile,
+void SyncExtensionHelper::EnableExtension(Profile* profile,
                                               const std::string& name) {

[akalin, 2011/08/11 00:08:08]

indent

[Raghu Simha, 2011/08/11 00:30:50]

Good catch. Done.

   profile->GetExtensionService()->EnableExtension(NameToId(name));
 }
 
-void LiveSyncExtensionHelper::DisableExtension(Profile* profile,
+void SyncExtensionHelper::DisableExtension(Profile* profile,
                                                const std::string& name) {

[akalin, 2011/08/11 00:08:08]

indent

[Raghu Simha, 2011/08/11 00:30:50]

Good catch. Done.

   profile->GetExtensionService()->DisableExtension(NameToId(name));
 }
 
-bool LiveSyncExtensionHelper::IsExtensionEnabled(
+bool SyncExtensionHelper::IsExtensionEnabled(
     Profile* profile, const std::string& name) const {
   return profile->GetExtensionService()->IsExtensionEnabled(NameToId(name));
 }
 
-void LiveSyncExtensionHelper::IncognitoEnableExtension(
+void SyncExtensionHelper::IncognitoEnableExtension(
     Profile* profile, const std::string& name) {
   profile->GetExtensionService()->SetIsIncognitoEnabled(NameToId(name), true);
 }
 
-void LiveSyncExtensionHelper::IncognitoDisableExtension(
+void SyncExtensionHelper::IncognitoDisableExtension(
     Profile* profile, const std::string& name) {
   profile->GetExtensionService()->SetIsIncognitoEnabled(NameToId(name), false);
 }
 
-bool LiveSyncExtensionHelper::IsIncognitoEnabled(
+bool SyncExtensionHelper::IsIncognitoEnabled(
     Profile* profile, const std::string& name) const {
   return profile->GetExtensionService()->IsIncognitoEnabled(NameToId(name));
 }
 
 
-bool LiveSyncExtensionHelper::IsExtensionPendingInstallForSync(
+bool SyncExtensionHelper::IsExtensionPendingInstallForSync(
     Profile* profile, const std::string& id) const {
   const PendingExtensionManager* pending_extension_manager =
       profile->GetExtensionService()->pending_extension_manager();
   PendingExtensionInfo info;
   if (!pending_extension_manager->GetById(id, &info)) {
     return false;
   }
   return info.is_from_sync();
 }
 
-void LiveSyncExtensionHelper::InstallExtensionsPendingForSync(
+void SyncExtensionHelper::InstallExtensionsPendingForSync(
     Profile* profile, Extension::Type type) {
   // TODO(akalin): Mock out the servers that the extensions auto-update
   // mechanism talk to so as to more closely match what actually happens.
   // Background networking will need to be re-enabled for extensions tests.
 
   // We make a copy here since InstallExtension() removes the
   // extension from the extensions service's copy.
   const PendingExtensionManager* pending_extension_manager =
       profile->GetExtensionService()->pending_extension_manager();
   PendingExtensionManager::PendingExtensionMap pending_extensions(
       pending_extension_manager->begin(),
       pending_extension_manager->end());
   for (PendingExtensionManager::const_iterator it = pending_extensions.begin();
        it != pending_extensions.end(); ++it) {
     if (!it->second.is_from_sync()) {
       continue;
     }
     const std::string& id = it->first;
     StringMap::const_iterator it2 = id_to_name_.find(id);
     if (it2 == id_to_name_.end()) {
       ADD_FAILURE() << "Could not get name for id " << id
                     << " (profile = " << profile->GetDebugName() << ")";
       continue;
     }
     InstallExtension(profile, it2->second, type);
   }
 }
 
-LiveSyncExtensionHelper::ExtensionStateMap
-    LiveSyncExtensionHelper::GetExtensionStates(Profile* profile) {
+SyncExtensionHelper::ExtensionStateMap
+    SyncExtensionHelper::GetExtensionStates(Profile* profile) {
   const std::string& profile_debug_name = profile->GetDebugName();
 
   ExtensionStateMap extension_state_map;
 
   ExtensionService* extension_service = profile->GetExtensionService();
 
   const ExtensionList* extensions = extension_service->extensions();
   for (ExtensionList::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     const std::string& id = (*it)->id();
@@ skipping 25 matching lines @@
     extension_state_map[id].enabled_state = ExtensionState::PENDING;
     extension_state_map[id].incognito_enabled =
         extension_service->IsIncognitoEnabled(id);
     VLOG(2) << "Extension " << it->first << " in profile "
             << profile_debug_name << " is pending";
   }
 
   return extension_state_map;
 }
 
-bool LiveSyncExtensionHelper::ExtensionStatesMatch(
+bool SyncExtensionHelper::ExtensionStatesMatch(
     Profile* profile1, Profile* profile2) {
   const ExtensionStateMap& state_map1 = GetExtensionStates(profile1);
   const ExtensionStateMap& state_map2 = GetExtensionStates(profile2);
   if (state_map1.size() != state_map2.size()) {
     VLOG(1) << "Number of extensions for profile " << profile1->GetDebugName()
             << " does not match profile " << profile2->GetDebugName();
     return false;
   }
 
   ExtensionStateMap::const_iterator it1 = state_map1.begin();
   ExtensionStateMap::const_iterator it2 = state_map2.begin();
   while (it1 != state_map1.end()) {
     if (it1->first != it2->first) {
       VLOG(1) << "Extensions for profile " << profile1->GetDebugName()
               << " do not match profile " << profile2->GetDebugName();
       return false;
     } else if (!it1->second.Equals(it2->second)) {
       VLOG(1) << "Extension states for profile " << profile1->GetDebugName()
               << " do not match profile " << profile2->GetDebugName();
       return false;
     }
     ++it1;
     ++it2;
   }
   return true;
 }
 
-void LiveSyncExtensionHelper::SetupProfile(Profile* profile) {
+void SyncExtensionHelper::SetupProfile(Profile* profile) {
   profile->InitExtensions(true);
   profile_extensions_.insert(make_pair(profile, ExtensionNameMap()));
 }
 
 namespace {
 
 std::string NameToPublicKey(const std::string& name) {
   std::string public_key;
   std::string pem;
   EXPECT_TRUE(Extension::ProducePEM(name, &pem) &&
@@ skipping 56 matching lines @@
   }
   if (extension->GetType() != type) {
     EXPECT_EQ(type, extension->GetType());
     return NULL;
   }
   return extension;
 }
 
 }  // namespace
 
-scoped_refptr<Extension> LiveSyncExtensionHelper::GetExtension(
+scoped_refptr<Extension> SyncExtensionHelper::GetExtension(
     Profile* profile, const std::string& name,
     Extension::Type type) {
   if (name.empty()) {
     ADD_FAILURE();
     return NULL;
   }
   ProfileExtensionNameMap::iterator it = profile_extensions_.find(profile);
   if (it == profile_extensions_.end()) {
     ADD_FAILURE();
     return NULL;
@@ skipping 14 matching lines @@
   if (extension->id() != expected_id) {
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   VLOG(2) << "created extension with name = "
           << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   return extension;
 }