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 };
-
-  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
-  // state.
-  ExtensionStateMap GetExtensionStates(Profile* profile) const;
+  // Returns true iff |profile1| and |profile2| have the same extensions and
+  // they are all in the same state.
+  bool ExtensionStatesMatch(Profile* profile1, Profile* profile2) const;

[akalin, 2011/06/10 01:56:44]

I think this can be static

[braffert, 2011/06/10 16:49:17]

Done.  This required making the function non-const, and the same for
ExtensionStateMap(Profile*).  

 
  private:
+  struct ExtensionState {
+    ExtensionState();
+    ~ExtensionState();
+    enum EnabledState { DISABLED, PENDING, ENABLED };

[akalin, 2011/06/10 01:56:44]

Put types first, then blank line, then functions, then blank line, then
variables.  So:

struct ExtensionState {
  enum EnabledState ...;

  ExtensionState();
  ~ExtensionState();

  EnabledState enabled_state;
  bool incognito_enabled;
};

[braffert, 2011/06/10 16:49:17]

Done.

+    bool Equals(const ExtensionState &other) const;
+    EnabledState enabled_state;
+    bool incognito_enabled;
+  };
+  typedef std::map<std::string, ExtensionState> ExtensionStateMap;
   typedef std::map<std::string, scoped_refptr<Extension> > ExtensionNameMap;
   typedef std::map<Profile*, ExtensionNameMap> ProfileExtensionNameMap;
   typedef std::map<std::string, std::string> StringMap;
 
+  // Returns a map from |profile|'s installed extensions to their state.
+  ExtensionStateMap GetExtensionStates(Profile* profile) const;

[akalin, 2011/06/10 01:56:44]

I think this can be static

[braffert, 2011/06/10 16:49:17]

Done.

+
   // Initializes extensions for |profile| and creates an entry in
   // |profile_extensions_| for it.
   void SetupProfile(Profile* profile);
 
   // Returns an extension for the given name in |profile|.  type and
   // index.  Two extensions with the name but different profiles will
   // have the same id.
   scoped_refptr<Extension> GetExtension(
       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_