Adding new extension sync integration tests. Also modified the way that profile

chrome/test/live_sync/live_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 "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 "testing/gtest/include/gtest/gtest.h"
 
+LiveSyncExtensionHelper::ExtensionState::ExtensionState()
+    : enabled_state(ENABLED), incognito_enabled(false) {}
+
+LiveSyncExtensionHelper::ExtensionState::~ExtensionState() {}
+
+bool LiveSyncExtensionHelper::ExtensionState::Equals(
+    const LiveSyncExtensionHelper::ExtensionState &other) const {
+  return ((enabled_state == other.enabled_state) &&
+          (incognito_enabled == other.incognito_enabled));
+}
+
 LiveSyncExtensionHelper::LiveSyncExtensionHelper() {}
 
 LiveSyncExtensionHelper::~LiveSyncExtensionHelper() {}
 
 // static
 std::string LiveSyncExtensionHelper::NameToId(const std::string& name) {
   std::string id;
   EXPECT_TRUE(Extension::GenerateId(name, &id));
   return id;
 }
@@ skipping 12 matching lines @@
                                << " (profile = " << profile << ")";
   profile->GetExtensionService()->OnExtensionInstalled(extension);
 }
 
 void LiveSyncExtensionHelper::UninstallExtension(
     Profile* profile, const std::string& name) {
   ExtensionService::UninstallExtensionHelper(profile->GetExtensionService(),
                                              NameToId(name));
 }
 
+void LiveSyncExtensionHelper::EnableExtension(Profile* profile,
+                                              const std::string& name) {
+  profile->GetExtensionService()->EnableExtension(NameToId(name));
+}
+
+void LiveSyncExtensionHelper::DisableExtension(Profile* profile,
+                                               const std::string& name) {
+  profile->GetExtensionService()->DisableExtension(NameToId(name));
+}
+
+void LiveSyncExtensionHelper::IncognitoEnableExtension(
+    Profile* profile, const std::string& name) {
+  profile->GetExtensionService()->SetIsIncognitoEnabled(NameToId(name), true);
+}
+
+void LiveSyncExtensionHelper::IncognitoDisableExtension(
+    Profile* profile, const std::string& name) {
+  profile->GetExtensionService()->SetIsIncognitoEnabled(NameToId(name), false);
+}
+
 bool LiveSyncExtensionHelper::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();
 }
@@ skipping 32 matching lines @@
         Profile* profile) const {
   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) {
-    extension_state_map[(*it)->id()] = ENABLED;
+    const std::string& id = (*it)->id();
+    extension_state_map[id].enabled_state = ExtensionState::ENABLED;
+    extension_state_map[id].incognito_enabled =
+        extension_service->IsIncognitoEnabled(id);
     VLOG(2) << "Extension " << (*it)->id() << " in profile "
             << profile_debug_name << " is enabled";
   }
 
   const ExtensionList* disabled_extensions =
       extension_service->disabled_extensions();
   for (ExtensionList::const_iterator it = disabled_extensions->begin();
        it != disabled_extensions->end(); ++it) {
-    extension_state_map[(*it)->id()] = DISABLED;
+    const std::string& id = (*it)->id();
+    extension_state_map[id].enabled_state = ExtensionState::DISABLED;
+    extension_state_map[id].incognito_enabled =
+        extension_service->IsIncognitoEnabled(id);
     VLOG(2) << "Extension " << (*it)->id() << " in profile "
             << profile_debug_name << " is disabled";
   }
 
   const PendingExtensionManager* pending_extension_manager =
       extension_service->pending_extension_manager();
   PendingExtensionManager::const_iterator it;
   for (it = pending_extension_manager->begin();
        it != pending_extension_manager->end(); ++it) {
-    extension_state_map[it->first] = PENDING;
+    const std::string& id = it->first;
+    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::ExtensionStateMapsMatch(
+    Profile* profile1, Profile* profile2) {
+  ExtensionStateMap state_map1 = GetExtensionStates(profile1);
+  ExtensionStateMap state_map2 = GetExtensionStates(profile2);
+  for (ExtensionStateMap::iterator it = state_map1.begin();
+       it != state_map1.end(); ++it) {
+    if (!it->second.Equals(state_map2[it->first])) {

[akalin, 2011/06/09 23:44:39]

this isn't quite correct.  state_map2[...] auto-creates a value if it's not
there, so if it happens to match the default values, this won't return false.

You want something like:

const ExtensionStateMap& state_map1 = ...;
const ExtensionStateMap& state_map2 = ...;
if (state_map1.size() != state_map2.size()) {
  VLOG(1) << ...;
  return false;
}
return std::equal(state_map1.begin(), state_map1.end(), state_map2.begin(),
ExtensionStateEqual());

You'll have to define ExtensionStateEqual to forward to ExtensionState::Equal
(and add some logging if they don't match).  Don't forget to #include
<algorithm> for std::equal.

Alternatively, you could replace the call to std::equal with a loop over both
maps.  That might be more straightforward.

[braffert, 2011/06/10 01:23:58]

Done.

+      return false;
+    }
+    state_map2.erase(it->first);
+  }
+  return state_map2.empty();
+}
+
 void LiveSyncExtensionHelper::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;
@@ skipping 92 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;
 }