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

chrome/test/live_sync/live_sync_extension_helper.h

 // 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.
 
 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_SYNC_EXTENSION_HELPER_H_
 #define CHROME_TEST_LIVE_SYNC_LIVE_SYNC_EXTENSION_HELPER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/extension.h"
 
 class Extension;
 class LiveSyncTest;
 class Profile;
 
 class LiveSyncExtensionHelper {
  public:
-  enum ExtensionState { DISABLED, PENDING, ENABLED };
-
+  struct ExtensionState {
+    enum EnabledState { DISABLED, PENDING, ENABLED };
+    bool operator==(const ExtensionState &other) const;

[akalin, 2011/06/09 20:35:37]

Do you need this?  If so, operator overloading is generally against
Google/Chrome style.  Rename to Equals() should suffice.

[braffert, 2011/06/09 23:09:35]

Done.  This required some additional changes, because we can no longer use the
== operator to compare ExtensionStateMaps.

+    EnabledState enabled_state;

[akalin, 2011/06/09 20:35:37]

please define a default constructor to set these vars to some default value.

[braffert, 2011/06/09 23:09:35]

Done.

+    bool incognito_enabled;
+  };
   typedef std::map<std::string, ExtensionState> ExtensionStateMap;
 
   LiveSyncExtensionHelper();
   ~LiveSyncExtensionHelper();
 
   // Returns a generated extension ID for the given name.
   static std::string NameToId(const std::string& name);
 
   // Initializes the profiles in |test| and registers them with
   // internal data structures.
   void Setup(LiveSyncTest* test);
 
   // Installs the extension with the given name to |profile|.
   void InstallExtension(
       Profile* profile, const std::string& name, Extension::Type type);
 
   // Uninstalls the extension with the given name from |profile|.
   void UninstallExtension(Profile* profile, const std::string& name);
 
+  // Enables the extension with the given name on |profile|.
+  void EnableExtension(Profile* profile, const std::string& name);
+
+  // Disables the extension with the given name on |profile|.
+  void DisableExtension(Profile* profile, const std::string& name);
+
+  // Enables the extension with the given name to run in incognito mode
+  void IncognitoEnableExtension(Profile* profile, const std::string& name);
+
+  // Disables the extension with the given name from running in incognito mode
+  void IncognitoDisableExtension(Profile* profile, const std::string& name);
+
   // Returns true iff the extension with the given id is pending
   // install in |profile|.
   bool IsExtensionPendingInstallForSync(
       Profile* profile, const std::string& id) const;
 
   // Installs all extensions pending sync in |profile| of the given
   // type.
   void InstallExtensionsPendingForSync(Profile* profile, Extension::Type type);
 
   // Returns a map from |profile|'s installed extensions to their
@@ skipping 16 matching lines @@
       Profile* profile, const std::string& name,
       Extension::Type type) WARN_UNUSED_RESULT;
 
   ProfileExtensionNameMap profile_extensions_;
   StringMap id_to_name_;
 
   DISALLOW_COPY_AND_ASSIGN(LiveSyncExtensionHelper);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_LIVE_SYNC_EXTENSION_HELPER_H_