Make the Chrome Web Store Icon Syncable

chrome/browser/extensions/extension_service_unittest.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/extensions/extension_service_unittest.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 51 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/in_process_webkit/dom_storage_context.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
+#include "grit/browser_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_options.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
 #include "webkit/plugins/npapi/mock_plugin_list.h"
 #include "webkit/quota/quota_manager.h"
@@ skipping 1948 matching lines @@
   // Now try updating to v2.
   UpdateExtension(id, extensions_path.AppendASCII("v2.crx"), ENABLED);
   ASSERT_EQ(std::string("2"),
             service_->GetExtensionById(id, false)->version()->GetString());
 
   // Verify that the ordinals match.
   ASSERT_TRUE(new_page_ordinal.Equal(sorting->GetPageOrdinal(id)));
   ASSERT_TRUE(new_launch_ordinal.Equal(sorting->GetAppLaunchOrdinal(id)));
 }
 
+// Ensures that the CWS has properly initialized ordinals.
+TEST_F(ExtensionServiceTest, EnsureCWSOrdinalsInitialized) {
+  InitializeEmptyExtensionService();
+  service_->component_loader()->Add(IDR_WEBSTORE_MANIFEST,
+                                    FilePath(FILE_PATH_LITERAL("web_store")));
+  service_->Init();
+
+
+  ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
+  EXPECT_TRUE(
+      sorting->GetPageOrdinal(extension_misc::kWebStoreAppId).IsValid());
+  EXPECT_TRUE(
+      sorting->GetAppLaunchOrdinal(extension_misc::kWebStoreAppId).IsValid());
+}
+
 TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) {
   InitializeEmptyExtensionService();
   InitializeRequestContext();
   EXPECT_TRUE(service_->extensions()->is_empty());
 
   int pref_count = 0;
 
   // Install app1 with unlimited storage.
   const Extension* extension =
       PackAndInstallCRX(data_dir_.AppendASCII("app1"), INSTALL_NEW);
@@ skipping 2738 matching lines @@
   ASSERT_FALSE(AddPendingSyncInstall());
 
   // Wait for the external source to install.
   WaitForCrxInstall(crx_path_, INSTALL_NEW);
   ASSERT_TRUE(IsCrxInstalled());
 
   // Now that the extension is installed, sync request should fail
   // because the extension is already installed.
   ASSERT_FALSE(AddPendingSyncInstall());
 }