Add preexisting local extensions to sync bundle when sync is enabled.

chrome/browser/extensions/extension_service.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 1287 matching lines @@
       bundle = &app_sync_bundle_;
       bundle->filter = IsSyncableApp;
       break;
 
     default:
       LOG(FATAL) << "Got " << type << " ModelType";
   }
 
   bundle->sync_processor = sync_processor;
 
+  // Process extensions from sync.
   for (SyncDataList::const_iterator i = initial_sync_data.begin();
        i != initial_sync_data.end();
        ++i) {
     ExtensionSyncData extension_sync_data = ExtensionSyncData(*i);
     bundle->synced_extensions.insert(extension_sync_data.id());
     ProcessExtensionSyncData(extension_sync_data, *bundle);
   }
 
+  // Process local extensions.
+  // TODO(yoz): Determine whether pending extensions should be considered too.
+  //            See crbug.com/104399.
   SyncDataList sync_data_list = GetAllSyncData(type);
   SyncChangeList sync_change_list;
   for (SyncDataList::const_iterator i = sync_data_list.begin();
        i != sync_data_list.end();
        ++i) {
-    if (bundle->HasExtensionId(i->GetTag()))
+    if (bundle->HasExtensionId(i->GetTag())) {
       sync_change_list.push_back(SyncChange(SyncChange::ACTION_UPDATE, *i));
-    else
+    } else {
+      bundle->synced_extensions.insert(i->GetTag());
       sync_change_list.push_back(SyncChange(SyncChange::ACTION_ADD, *i));
+    }
   }
   bundle->sync_processor->ProcessSyncChanges(FROM_HERE, sync_change_list);
 
   return SyncError();
 }
 
 void ExtensionService::StopSyncing(syncable::ModelType type) {
   SyncBundle* bundle = GetSyncBundleForModelType(type);
   CHECK(bundle);
   // This is the simplest way to clear out the bundle.
@@ skipping 1222 matching lines @@
   //
   // To coexist with certain unit tests that don't have an IO thread message
   // loop available at ExtensionService shutdown, we lazy-initialize this
   // object so that those cases neither create nor destroy a SocketController.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!socket_controller_) {
     socket_controller_ = new extensions::SocketController();
   }
   return socket_controller_;
 }