Revert most of 128095 (but leave EXPECTs), restoring the AutoUpdate test.

chrome/browser/extensions/extension_management_browsertest.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 "base/memory/ref_counted.h"
 #include "base/stl_util.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"
@@ skipping 245 matching lines @@
   extension = service->GetExtensionById(
       "ogjcoiohnmldgjemafoockdghcjciccf", false);
   ASSERT_TRUE(extension);
   ASSERT_EQ("2.0", extension->VersionString());
   ASSERT_TRUE(notification_listener.started());
   ASSERT_TRUE(notification_listener.finished());
   ASSERT_TRUE(ContainsKey(notification_listener.updates(),
                           "ogjcoiohnmldgjemafoockdghcjciccf"));
   notification_listener.Reset();
 
-}
-
-IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, AutoUpdateBadKey) {
-  NotificationListener notification_listener;
-  FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
-  // Note: This interceptor gets requests on the IO thread.
-  scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
-  content::URLFetcher::SetEnableInterceptionForTests(true);
-
-  // Install version 2 of the extension.
-  ExtensionTestMessageListener listener2("v2 installed", false);
-  ExtensionService* service = browser()->profile()->GetExtensionService();
-  const size_t size_before = service->extensions()->size();
-  ASSERT_TRUE(service->disabled_extensions()->is_empty());
-  const Extension* extension =
-      InstallExtension(basedir.AppendASCII("v2.crx"), 1);
-  ASSERT_TRUE(extension);
-  listener2.WaitUntilSatisfied();
-  ASSERT_EQ(size_before + 1, service->extensions()->size());
-  ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", extension->id());
-  ASSERT_EQ("2.0", extension->VersionString());
-
   // Now try doing an update to version 3, which has been incorrectly
   // signed. This should fail.
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
                                      basedir.AppendASCII("manifest_v3.xml"));
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/v3.crx",
                                      basedir.AppendASCII("v3.crx"));
 
   service->updater()->CheckNow();
   ASSERT_TRUE(WaitForExtensionInstallError());
   ASSERT_TRUE(notification_listener.started());
@@ skipping 244 matching lines @@
         std::string(kExtensionId) + ";http://localhost/autoupdate/manifest"));
   }
   ASSERT_TRUE(WaitForExtensionInstall());
   ASSERT_EQ(size_before + 1, service->extensions()->size());
   extension = service->GetExtensionById(kExtensionId, false);
   ASSERT_TRUE(extension);
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
   EXPECT_TRUE(service->disabled_extensions()->is_empty());
 }