Revert 13676 - Revert 131665 - Add a preference for why an extension is disabled.

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_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 83 matching lines @@
   return names;
 }
 
 void SyncExtensionHelper::EnableExtension(Profile* profile,
                                           const std::string& name) {
   profile->GetExtensionService()->EnableExtension(NameToId(name));
 }
 
 void SyncExtensionHelper::DisableExtension(Profile* profile,
                                            const std::string& name) {
-  profile->GetExtensionService()->DisableExtension(NameToId(name));
+  profile->GetExtensionService()->DisableExtension(
+      NameToId(name), Extension::DISABLE_USER_ACTION);
 }
 
 bool SyncExtensionHelper::IsExtensionEnabled(
     Profile* profile, const std::string& name) const {
   return profile->GetExtensionService()->IsExtensionEnabled(NameToId(name));
 }
 
 void SyncExtensionHelper::IncognitoEnableExtension(
     Profile* profile, const std::string& name) {
   profile->GetExtensionService()->SetIsIncognitoEnabled(NameToId(name), true);
@@ skipping 229 matching lines @@
   if (extension->id() != expected_id) {
     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;
   return extension;
 }