Include v2 packaged apps in sync.

chrome/browser/sync/test/integration/sync_extension_helper.cc

Index: chrome/browser/sync/test/integration/sync_extension_helper.cc
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index a4ce6076fdf19927a0229c3ef539eb8721e2b725..1b0143adeb6e4a60ef102602bbaa43505a0c54ff 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -140,8 +140,7 @@ bool SyncExtensionHelper::IsExtensionPendingInstallForSync(
   return info->is_from_sync();
 }
 
-void SyncExtensionHelper::InstallExtensionsPendingForSync(
-    Profile* profile, Extension::Type type) {
+void SyncExtensionHelper::InstallExtensionsPendingForSync(Profile* profile) {

[Marijn Kruisselbrink, 2012/11/19 18:43:01]

To properly support different types of extensions in one test I changed this to
not get the extension type passed here, but instead I handle it similar to how
the name of an extension is associated with an id.

   // TODO(akalin): Mock out the servers that the extensions auto-update
   // mechanism talk to so as to more closely match what actually happens.
   // Background networking will need to be re-enabled for extensions tests.
@@ -167,7 +166,12 @@ void SyncExtensionHelper::InstallExtensionsPendingForSync(
                     << " (profile = " << profile->GetDebugName() << ")";
       continue;
     }
-    InstallExtension(profile, iter2->second, type);
+    TypeMap::const_iterator iter3 = id_to_type_.find(*iter);
+    if (iter3 == id_to_type_.end()) {
+      ADD_FAILURE() << "Could not get type for id " << *iter
+                    << " (profile = " << profile->GetDebugName() << ")";
+    }
+    InstallExtension(profile, iter2->second, iter3->second);
   }
 }
 
@@ -282,6 +286,16 @@ scoped_refptr<Extension> CreateExtension(
       source.SetString(extension_manifest_keys::kLaunchWebURL,
                        "http://www.example.com");
       break;
+    case Extension::TYPE_PLATFORM_APP: {
+      source.Set(extension_manifest_keys::kApp, new DictionaryValue());
+      source.Set(extension_manifest_keys::kPlatformAppBackground,
+                 new DictionaryValue());
+      ListValue* scripts = new ListValue();
+      scripts->AppendString("main.js");
+      source.Set(extension_manifest_keys::kPlatformAppBackgroundScripts,
+                 scripts);
+      break;
+    }
     default:
       ADD_FAILURE();
       return NULL;
@@ -289,8 +303,11 @@ scoped_refptr<Extension> CreateExtension(
   const FilePath sub_dir = FilePath().AppendASCII(name);
   FilePath extension_dir;
   if (!file_util::PathExists(base_dir) &&
-      !file_util::CreateDirectory(base_dir) &&
-      !file_util::CreateTemporaryDirInDir(

[Marijn Kruisselbrink, 2012/11/19 18:43:01]

I think this if statement doesn't do what it was supposed to do (only if
base_dir doesn't exist and couldn't be created does it try to create a
subdirectory in base_dir?) so I split it up into two if statements
(alternatively the last && could have been changed into ||, but I don't see the
point in making the code more complicated then necessary.

+      !file_util::CreateDirectory(base_dir)) {
+    ADD_FAILURE();
+    return NULL;
+  }
+  if (!file_util::CreateTemporaryDirInDir(
           base_dir, sub_dir.value(), &extension_dir)) {
     ADD_FAILURE();
     return NULL;
@@ -353,5 +370,6 @@ scoped_refptr<Extension> SyncExtensionHelper::GetExtension(
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
+  id_to_type_[expected_id] = type;
   return extension;
 }