Make the Chrome Web Store Icon Syncable

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_sorting.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/string_ordinal.h"
 
 namespace {
 
 struct AppState {
   AppState();
   ~AppState();
+  bool IsValid() const;
   bool Equals(const AppState& other) const;
 
   StringOrdinal app_launch_ordinal;
   StringOrdinal page_ordinal;
 };
 
 typedef std::map<std::string, AppState> AppStateMap;
 
 AppState::AppState() {}
 
 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.Equal(other.app_launch_ordinal) &&
       page_ordinal.Equal(other.page_ordinal);
 }
 
 // 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->GetAppLaunchOrdinal(id);
@@ skipping 63 matching lines @@
     return false;
   }
 
   AppStateMap::const_iterator it1 = state_map1.begin();
   AppStateMap::const_iterator it2 = state_map2.begin();
   while (it1 != state_map1.end()) {
     if (it1->first != it2->first) {
       DVLOG(2) << "Apps for profile " << profile1->GetDebugName()
                << " do not match profile " << profile2->GetDebugName();
       return false;
+    } else if (!it1->second.IsValid()) {
+      DVLOG(2) << "Apps for profile " << profile1->GetDebugName()
+               << " are not valid.";
+      return false;
+    } else if (!it2->second.IsValid()) {
+      DVLOG(2) << "Apps for profile " << profile2->GetDebugName()
+               << " are not valid.";
+      return false;
     } else if (!it1->second.Equals(it2->second)) {
       DVLOG(2) << "App states for profile " << profile1->GetDebugName()
                << " do not match profile " << profile2->GetDebugName();
       return false;
     }
     ++it1;
     ++it2;
   }
 
   return true;
@@ skipping 29 matching lines @@
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
   profile->GetExtensionService()->extension_prefs()->
       extension_sorting()->FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}