Add in-profile external_extensions.json file for Chrome OS OEM customization.

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 55255f35ec69b7d509dd2f02927491b579f998cd..583d135f470da0b9960d4510696aa13d9f804cbe 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -3034,6 +3034,62 @@ TEST_F(ExtensionServiceTest, ExternalUninstall) {
   ASSERT_EQ(0u, loaded_.size());
 }
 
+// Test that running multiple update checks simultaneously does not

[Erik does not do reviews, 2011/01/21 17:05:25]

just curious, was there a bug here that this would have caught?

[Sam Kerner (Chrome), 2011/01/21 17:59:26]

No.  I created the test while reading the code to verify that it worked, and
make it easy to step thru in the debugger.  Committing it should help catch
regressions.

Dmitry will need to call this function after updates to the OEM manifest. 
Today, the only call to CheckForExternalUpdates() is in the ExtensionService
constructor.  I wanted to make sure Dmitry's use case won't break anything.

+// keep the update from succeeding.
+TEST_F(ExtensionServiceTest, MultipleExternalUpdateCheck) {
+  InitializeEmptyExtensionService();
+
+  MockExtensionProvider* provider =
+      new MockExtensionProvider(service_.get(), Extension::EXTERNAL_PREF);
+  AddMockExternalProvider(provider);
+
+  // Verify that starting with no providers loads no extensions.
+  service_->Init();
+  loop_.RunAllPending();
+  ASSERT_EQ(0u, loaded_.size());
+
+  // Start two checks for updates.
+  provider->set_visit_count(0);
+  service_->CheckForExternalUpdates();
+  service_->CheckForExternalUpdates();
+  loop_.RunAllPending();
+  // Two calls should cause two checks for external extensions.

[Erik does not do reviews, 2011/01/21 17:05:25]

nit: newline above comment

[Sam Kerner (Chrome), 2011/01/21 17:59:26]

Done.

+  EXPECT_EQ(2, provider->visit_count());
+  EXPECT_EQ(0u, GetErrors().size());
+  EXPECT_EQ(0u, loaded_.size());
+
+  // Register a test extension externally using the mock registry provider.
+  FilePath source_path;
+  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_path));
+  source_path = source_path.AppendASCII("extensions").AppendASCII("good.crx");
+  provider->UpdateOrAddExtension(good_crx, "1.0.0.0", source_path);
+
+  // Two checks for external updates should find the extension, an install it

[Erik does not do reviews, 2011/01/21 17:05:25]

an->and

[Sam Kerner (Chrome), 2011/01/21 17:59:26]

Done.

+  // once.
+  provider->set_visit_count(0);
+  service_->CheckForExternalUpdates();
+  service_->CheckForExternalUpdates();
+  loop_.RunAllPending();
+  EXPECT_EQ(2, provider->visit_count());
+  ASSERT_EQ(0u, GetErrors().size());
+  ASSERT_EQ(1u, loaded_.size());
+  ASSERT_EQ(Extension::EXTERNAL_PREF, loaded_[0]->location());
+  ASSERT_EQ("1.0.0.0", loaded_[0]->version()->GetString());
+  ValidatePrefKeyCount(1);
+  ValidateIntegerPref(good_crx, "state", Extension::ENABLED);
+  ValidateIntegerPref(good_crx, "location", Extension::EXTERNAL_PREF);
+
+  provider->RemoveExtension(good_crx);
+  provider->set_visit_count(0);
+  service_->CheckForExternalUpdates();
+  service_->CheckForExternalUpdates();
+  loop_.RunAllPending();
+  // Two calls should cause two checks for external extensions.

[Erik does not do reviews, 2011/01/21 17:05:25]

nit: newline
also, add comment why loaded should be 0 here

[Sam Kerner (Chrome), 2011/01/21 17:59:26]

Done.

+  EXPECT_EQ(2, provider->visit_count());
+  EXPECT_EQ(0u, GetErrors().size());
+  EXPECT_EQ(0u, loaded_.size());
+}
+
 TEST_F(ExtensionServiceTest, ExternalPrefProvider) {
   InitializeEmptyExtensionService();