Adding browsertest to verify that updating forced-installed extensions is possible.

chrome/browser/policy/policy_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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 15 matching lines @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/policy/cloud/test_request_interceptor.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
@@ skipping 94 matching lines @@
     FILE_PATH_LITERAL("adblock.crx");
 const base::FilePath::CharType kHostedAppCrxName[] =
     FILE_PATH_LITERAL("hosted_app.crx");
 
 const char kGoodCrxId[] = "ldnnhddmnhbkjipkidpdiheffobcpfmf";
 const char kAdBlockCrxId[] = "dojnnbeimaimaojcialkkgajdnefpgcn";
 const char kHostedAppCrxId[] = "kbmnembihfiondgfjekmnmcbddelicoi";
 
 const base::FilePath::CharType kGoodCrxManifestName[] =
     FILE_PATH_LITERAL("good_update_manifest.xml");
+const base::FilePath::CharType kGood2CrxManifestName[] =
+    FILE_PATH_LITERAL("good2_update_manifest.xml");
+const base::FilePath::CharType kGoodV1CrxManifestName[] =
+    FILE_PATH_LITERAL("good_v1_update_manifest.xml");

[Joao da Silva, 2013/05/28 08:27:31]

Use consistent names for the files: "good_v1_*" and "good_v2_*"

[csorba, 2013/05/28 12:00:39]

I tried to introduce as few new crx files as possible, so I use good2.crx
together with a slightly modified version of good.crx (good_v1.crx) which
contains an "update_url".

 const base::FilePath::CharType kGoodUnpackedExt[] =
     FILE_PATH_LITERAL("good_unpacked");
 const base::FilePath::CharType kAppUnpackedExt[] =
     FILE_PATH_LITERAL("app");
 
 // Filters requests to the hosts in |urls| and redirects them to the test data
 // dir through URLRequestMockHTTPJobs.
 void RedirectHostsToTestData(const char* const urls[], size_t size) {
   // Map the given hosts to the test data dir.
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
@@ skipping 1130 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallForcelist) {
   // Verifies that extensions that are force-installed by policies are
   // installed and can't be uninstalled.
   ExtensionService* service = extension_service();
   ASSERT_FALSE(service->GetExtensionById(kGoodCrxId, true));
 
   // Extensions that are force-installed come from an update URL, which defaults
   // to the webstore. Use a mock URL for this test with an update manifest
-  // that includes "good.crx".
+  // that includes "good_v1.crx".
   base::FilePath path =
-      base::FilePath(kTestExtensionsDir).Append(kGoodCrxManifestName);
+      base::FilePath(kTestExtensionsDir).Append(kGoodV1CrxManifestName);
   GURL url(URLRequestMockHTTPJob::GetMockUrl(path));
 
-  // Setting the forcelist extension should install "good.crx".
+  // Setting the forcelist extension should install "good_v1.crx".
   base::ListValue forcelist;
   forcelist.Append(base::Value::CreateStringValue(base::StringPrintf(
       "%s;%s", kGoodCrxId, url.spec().c_str())));
   PolicyMap policies;
   policies.Set(key::kExtensionInstallForcelist, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, forcelist.DeepCopy());
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::NotificationService::AllSources());
   UpdateProviderPolicy(policies);
   observer.Wait();
   // Note: Cannot check that the notification details match the expected
   // exception, since the details object has already been freed prior to
   // the completion of observer.Wait().
 
   EXPECT_TRUE(service->GetExtensionById(kGoodCrxId, true));
 
   // The user is not allowed to uninstall force-installed extensions.
   UninstallExtension(kGoodCrxId, false);
 
   // The user is not allowed to load an unpacked extension with the
   // same ID as a force-installed extension.
   LoadUnpackedExtension(kGoodUnpackedExt, false);
 
   // Loading other unpacked extensions are not blocked.
   LoadUnpackedExtension(kAppUnpackedExt, true);
+
+  const std::string old_version_number =
+      service->GetExtensionById(kGoodCrxId, true)->version()->GetString();
+
+  base::FilePath test_path;
+  PathService::Get(chrome::DIR_TEST_DATA, &test_path);

[Joao da Silva, 2013/05/28 08:27:31]

ASSERT_TRUE( ... )

[csorba, 2013/05/28 12:00:39]

Done.

+
+  scoped_ptr<TestRequestInterceptor> interceptor;

[Joao da Silva, 2013/05/28 08:27:31]

No need to have this in a scoped_ptr, just use a value directly:

TestRequestInterceptor interceptor("update.extension");

+  interceptor.reset(new TestRequestInterceptor("update.extension"));
+  interceptor->PushJobCallback(
+      TestRequestInterceptor::MockJob(
+          test_path.Append(kTestExtensionsDir).Append(kGood2CrxManifestName)));
+
+  // Updating the force-installed extension.
+  extensions::ExtensionUpdater* updater = service->updater();
+  extensions::ExtensionUpdater::CheckParams params;
+  params.install_immediately = true;
+  content::WindowedNotificationObserver update_observer(
+      chrome::NOTIFICATION_EXTENSION_INSTALLED,
+      content::NotificationService::AllSources());
+  updater->CheckNow(params);
+  update_observer.Wait();
+
+  const base::Version* new_version =
+           service->GetExtensionById(kGoodCrxId, true)->version();

[Joao da Silva, 2013/05/28 08:27:31]

nit: indent

[csorba, 2013/05/28 12:00:39]

Done.

+
+  EXPECT_FALSE(new_version->IsOlderThan(old_version_number));

[Joao da Silva, 2013/05/28 08:27:31]

This would pass even if new_version == old_version_number. It should be

base::Version old_version(old_version_number);
ASSERT_TRUE(old_version.IsValid());
EXPECT_EQ(1, new_version->CompareTo(old_version));

[csorba, 2013/05/28 12:00:39]

Done + ASSERT_TRUE(new_version->IsValid()) added.

 }

[Joao da Silva, 2013/05/28 08:27:31]

Verify that the expected callback jobs were used before ending the test:

EXPECT_EQ(0u, interceptor.GetPendingSize());

[csorba, 2013/05/28 12:00:39]

Done.

 
 IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionAllowedTypes) {
   // Verifies that extensions are blocked if policy specifies an allowed types
   // list and the extension's type is not on that list.
   ExtensionService* service = extension_service();
   ASSERT_FALSE(service->GetExtensionById(kGoodCrxId, true));
   ASSERT_FALSE(service->GetExtensionById(kHostedAppCrxId, true));
 
   base::ListValue allowed_types;
   allowed_types.AppendString("hosted_app");
@@ skipping 764 matching lines @@
       chrome_variations::VariationsService::GetVariationsServerURL(
           g_browser_process->local_state());
   EXPECT_TRUE(StartsWithASCII(url.spec(), default_variations_url, true));
   std::string value;
   EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value));
   EXPECT_EQ("restricted", value);
 }
 #endif
 
 }  // namespace policy