Include v2 packaged apps in sync.

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

 // 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.
 
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 122 matching lines @@
     Profile* profile, const std::string& id) const {
   const extensions::PendingExtensionManager* pending_extension_manager =
       profile->GetExtensionService()->pending_extension_manager();
   const extensions::PendingExtensionInfo* info =
       pending_extension_manager->GetById(id);
   if (!info)
     return false;
   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.
 
   // We make a copy here since InstallExtension() removes the
   // extension from the extensions service's copy.
   const extensions::PendingExtensionManager* pending_extension_manager =
       profile->GetExtensionService()->pending_extension_manager();
 
   std::list<std::string> pending_crx_ids;
   pending_extension_manager->GetPendingIdsForUpdateCheck(&pending_crx_ids);
 
   std::list<std::string>::const_iterator iter;
   const extensions::PendingExtensionInfo* info = NULL;
   for (iter = pending_crx_ids.begin(); iter != pending_crx_ids.end(); ++iter) {
     ASSERT_TRUE((info = pending_extension_manager->GetById(*iter)));
     if (!info->is_from_sync())
       continue;
 
     StringMap::const_iterator iter2 = id_to_name_.find(*iter);
     if (iter2 == id_to_name_.end()) {
       ADD_FAILURE() << "Could not get name for id " << *iter
                     << " (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);
   }
 }
 
 SyncExtensionHelper::ExtensionStateMap
     SyncExtensionHelper::GetExtensionStates(Profile* profile) {
   const std::string& profile_debug_name = profile->GetDebugName();
 
   ExtensionStateMap extension_state_map;
 
   ExtensionService* extension_service = profile->GetExtensionService();
@@ skipping 94 matching lines @@
       break;
     case Extension::TYPE_THEME:
       source.Set(extension_manifest_keys::kTheme, new DictionaryValue());
       break;
     case Extension::TYPE_HOSTED_APP:
     case Extension::TYPE_LEGACY_PACKAGED_APP:
       source.Set(extension_manifest_keys::kApp, new DictionaryValue());
       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;
   }
   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;
   }
   std::string error;
   scoped_refptr<Extension> extension =
       Extension::Create(extension_dir, Extension::INTERNAL, source,
                         Extension::NO_FLAGS, &error);
   if (!error.empty()) {
     ADD_FAILURE() << error;
@@ skipping 42 matching lines @@
   }
   const std::string& expected_id = NameToId(name);
   if (extension->id() != expected_id) {
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   DVLOG(2) << "created extension with name = "
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
+  id_to_type_[expected_id] = type;
   return extension;
 }