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"
@@ skipping 30 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;
+    extension_state_map[(*it)->id()].first = ENABLED;
+    if (extension_service->IsIncognitoEnabled((*it)->id())) {
+      extension_state_map[(*it)->id()].second = INCOGNITO_ENABLED;
+    } else {
+      extension_state_map[(*it)->id()].second = INCOGNITO_DISABLED;
+    }
     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;
+    extension_state_map[(*it)->id()].first = DISABLED;
+    if (extension_service->IsIncognitoEnabled((*it)->id())) {
+      extension_state_map[(*it)->id()].second = INCOGNITO_ENABLED;
+    } else {
+      extension_state_map[(*it)->id()].second = INCOGNITO_DISABLED;
+    }
     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;
+    extension_state_map[it->first].first = PENDING;
+    if (extension_service->IsIncognitoEnabled(it->first)) {
+      extension_state_map[it->first].second = INCOGNITO_ENABLED;
+    } else {
+      extension_state_map[it->first].second = INCOGNITO_DISABLED;
+    }
     VLOG(2) << "Extension " << it->first << " in profile "
             << profile_debug_name << " is pending";
   }
 
   return extension_state_map;
 }
 
 void LiveSyncExtensionHelper::SetupProfile(Profile* profile) {
   profile->InitExtensions(true);
   profile_extensions_.insert(make_pair(profile, ExtensionNameMap()));
@@ skipping 99 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;
 }