Merge 233885 "Revert 231221 - "Remove enabled/disabled state fro..."

chrome/browser/sync/test/integration/sync_extension_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/sync_extension_helper.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 79 matching lines @@
   scoped_ptr<const ExtensionSet> extensions(
       extension_service->GenerateInstalledExtensionsSet());
   for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
   return names;
 }
 
+void SyncExtensionHelper::EnableExtension(Profile* profile,
+                                          const std::string& name) {
+  profile->GetExtensionService()->EnableExtension(
+      extensions::id_util::GenerateId(name));
+}
+
+void SyncExtensionHelper::DisableExtension(Profile* profile,
+                                           const std::string& name) {
+  profile->GetExtensionService()->DisableExtension(
+      extensions::id_util::GenerateId(name), Extension::DISABLE_USER_ACTION);
+}
+
 bool SyncExtensionHelper::IsExtensionEnabled(
     Profile* profile, const std::string& name) const {
   return profile->GetExtensionService()->IsExtensionEnabled(
       extensions::id_util::GenerateId(name));
 }
 
 void SyncExtensionHelper::IncognitoEnableExtension(
     Profile* profile, const std::string& name) {
   extension_util::SetIsIncognitoEnabled(extensions::id_util::GenerateId(name),
                                         profile->GetExtensionService(), true);
@@ skipping 248 matching lines @@
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   DVLOG(2) << "created extension with name = "
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   id_to_type_[expected_id] = type;
   return extension;
 }