Include v2 packaged apps in sync.

chrome/browser/sync/test/integration/sync_extension_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_SYNC_EXTENSION_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 54 matching lines @@
   // Returns true iff the extension is enabled in incognito mode on |profile|.
   bool IsIncognitoEnabled(Profile* profile, const std::string& name) const;
 
   // 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,
-                                       extensions::Extension::Type type);
+  void InstallExtensionsPendingForSync(Profile* profile);
 
   // Returns true iff |profile1| and |profile2| have the same extensions and
   // they are all in the same state.
   static bool ExtensionStatesMatch(Profile* profile1, Profile* profile2);
 
  private:
   struct ExtensionState {
     enum EnabledState { DISABLED, PENDING, ENABLED };
 
     ExtensionState();
     ~ExtensionState();
     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<extensions::Extension> >
       ExtensionNameMap;
   typedef std::map<Profile*, ExtensionNameMap> ProfileExtensionNameMap;
   typedef std::map<std::string, std::string> StringMap;
+  typedef std::map<std::string, extensions::Extension::Type> TypeMap;
 
   friend struct DefaultSingletonTraits<SyncExtensionHelper>;
 
   SyncExtensionHelper();
   ~SyncExtensionHelper();
 
   // Returns a map from |profile|'s installed extensions to their state.
   static ExtensionStateMap GetExtensionStates(Profile* profile);
 
   // 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<extensions::Extension> GetExtension(
       Profile* profile, const std::string& name,
       extensions::Extension::Type type) WARN_UNUSED_RESULT;
 
   ProfileExtensionNameMap profile_extensions_;
   StringMap id_to_name_;
+  TypeMap id_to_type_;
   bool setup_completed_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncExtensionHelper);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_