Clean up threading model of external extension providers

chrome/browser/extensions/extension_management_browsertest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "base/ref_counted.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/extension_updater.h"
@@ skipping 333 matching lines @@
   ASSERT_TRUE(service->disabled_extensions()->empty());
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   {
     // Set the policy as a user preference and fire notification observers.
     ScopedPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
     ListValue* forcelist =
         prefs->GetMutableList(prefs::kExtensionInstallForceList);
     ASSERT_TRUE(forcelist->empty());
     forcelist->Append(Value::CreateStringValue(
-        "ogjcoiohnmldgjemafoockdghcjciccf;"
-        "http://localhost/autoupdate/manifest"));
+        std::string(kExtensionId) +
+        ";http://localhost/autoupdate/manifest"));
   }
 
   // Check if the extension got installed.
   ASSERT_TRUE(WaitForExtensionInstall());
   const ExtensionList* extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   ASSERT_EQ(kExtensionId, extensions->at(size_before)->id());
   EXPECT_EQ("2.0", extensions->at(size_before)->VersionString());
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD,
             extensions->at(size_before)->location());
 
-  // Check that emptying the list doesn't cause any trouble.
-  prefs->ClearPref(prefs::kExtensionInstallForceList);
+  // Check that emptying the list triggers uninstall.
+  {
+    ScopedPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
+    prefs->ClearPref(prefs::kExtensionInstallForceList);
+  }
+  EXPECT_EQ(size_before, extensions->size());
+  ExtensionList::const_iterator i;
+  for (i = extensions->begin(); i != extensions->end(); ++i)
+    EXPECT_NE(kExtensionId, (*i)->id());
 }