Improve ExtensionBrowserTest. Part of moving ExtensionService to use ExtensionSet.

chrome/browser/extensions/extension_management_api_browsertest.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 "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_management_api.h"
 #include "chrome/browser/extensions/extension_management_api_constants.h"
@@ skipping 52 matching lines @@
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionService* service = browser()->profile()->GetExtensionService();
 
     // Install low-permission version of the extension.
     ASSERT_TRUE(InstallExtension(
         test_data_dir_.AppendASCII("permissions-low-v1.crx"), 1));
     EXPECT_TRUE(service->GetExtensionById(kId, false) != NULL);
 
     // Update to a high-permission version - it should get disabled.
-    EXPECT_TRUE(UpdateExtension(
+    EXPECT_FALSE(UpdateExtension(
         kId, test_data_dir_.AppendASCII("permissions-high-v2.crx"), -1));
     EXPECT_TRUE(service->GetExtensionById(kId, false) == NULL);
     EXPECT_TRUE(service->GetExtensionById(kId, true) != NULL);
     EXPECT_TRUE(
         service->extension_prefs()->DidExtensionEscalatePermissions(kId));
   }
 
   void ReEnable(bool user_gesture, const std::string& expected_error) {
     scoped_refptr<SetEnabledFunction> function(new SetEnabledFunction);
     if (user_gesture)
@@ skipping 37 matching lines @@
   ReEnable(false, keys::kGestureNeededForEscalationError);
 
   // Expect an error that user cancelled the dialog.
   SetExtensionInstallDialogAutoConfirmForTests(false);
   ReEnable(true, keys::kUserDidNotReEnableError);
 
   // This should succeed when user accepts dialog.
   SetExtensionInstallDialogAutoConfirmForTests(true);
   ReEnable(true, "");
 }