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

chrome/browser/sync/test/integration/apps_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
@@ skipping 24 matching lines @@
 // verifier), and returns the extension ID of the new app.
 std::string InstallAppForAllProfiles(int index);
 
 // Uninstalls the app for the given index from |profile|. Assumes that it was
 // previously installed.
 void UninstallApp(Profile* profile, int index);
 
 // Installs all pending synced apps for |profile|.
 void InstallAppsPendingForSync(Profile* profile);
 
+// Enables the app for the given index on |profile|.
+void EnableApp(Profile* profile, int index);
+
+// Disables the app for the given index on |profile|.
+void DisableApp(Profile* profile, int index);
+
 // Enables the app for the given index in incognito mode on |profile|.
 void IncognitoEnableApp(Profile* profile, int index);
 
 // Disables the app for the given index in incognito mode on |profile|.
 void IncognitoDisableApp(Profile* profile, int index);
 
 // Gets the page ordinal value for the application at the given index on
 // |profile|.
 syncer::StringOrdinal GetPageOrdinalForApp(Profile* profile, int app_index);
 
@@ skipping 19 matching lines @@
 // The main intention of this is to properly setup the values on the verifier
 // profile in situations where the other profiles have conflicting values.
 void CopyNTPOrdinals(Profile* source, Profile* destination, int index);
 
 // Fix any NTP icon collisions that are currently in |profile|.
 void FixNTPOrdinalCollisions(Profile* profile);
 
 }  // namespace apps_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_