Sync the launch type pref for apps.

chrome/browser/sync/test/integration/sync_app_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_app_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/id_util.h"
 
 namespace {
 
 struct AppState {
   AppState();
   ~AppState();
   bool IsValid() const;
   bool Equals(const AppState& other) const;
 
   syncer::StringOrdinal app_launch_ordinal;
   syncer::StringOrdinal page_ordinal;
+  extensions::LaunchType launch_type;
 };
 
 typedef std::map<std::string, AppState> AppStateMap;
 
-AppState::AppState() {}
+AppState::AppState() : launch_type(extensions::LAUNCH_TYPE_INVALID) {}
 
 AppState::~AppState() {}
 
 bool AppState::IsValid() const {
   return page_ordinal.IsValid() && app_launch_ordinal.IsValid();
 }
 
 bool AppState::Equals(const AppState& other) const {
   return app_launch_ordinal.Equals(other.app_launch_ordinal) &&
-      page_ordinal.Equals(other.page_ordinal);
+      page_ordinal.Equals(other.page_ordinal) &&
+      launch_type == other.launch_type;
 }
 
 // Load all the app specific values for |id| into |app_state|.
 void LoadApp(ExtensionService* extension_service,
              const std::string& id,
              AppState* app_state) {
   app_state->app_launch_ordinal = extension_service->extension_prefs()->
       app_sorting()->GetAppLaunchOrdinal(id);
   app_state->page_ordinal = extension_service->extension_prefs()->
       app_sorting()->GetPageOrdinal(id);
+  app_state->launch_type =
+      extensions::GetLaunchTypePrefValue(extension_service->extension_prefs(),
+                                         id);
 }
 
 // Returns a map from |profile|'s installed extensions to their state.
 AppStateMap GetAppStates(Profile* profile) {
   AppStateMap app_state_map;
 
   ExtensionService* extension_service = profile->GetExtensionService();
 
   scoped_ptr<const extensions::ExtensionSet> extensions(
       extension_service->GenerateInstalledExtensionsSet());
@@ skipping 113 matching lines @@
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
   profile->GetExtensionService()->extension_prefs()->app_sorting()->
       FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}