Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1037)

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 16102004: Adding browsertest to verify that updating forced-installed extensions is possible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/cloud/test_request_interceptor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 78070ed76f5f0821b7e8e0cd45d01a45818a4c35..2a73a2fee965168e6ae85de04567759400b97e55 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -33,6 +33,7 @@
#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"
@@ -40,6 +41,7 @@
#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"
@@ -154,6 +156,10 @@ 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");
const base::FilePath::CharType kGoodUnpackedExt[] =
FILE_PATH_LITERAL("good_unpacked");
const base::FilePath::CharType kAppUnpackedExt[] =
@@ -1304,12 +1310,12 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallForcelist) {
// 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())));
@@ -1336,6 +1342,37 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallForcelist) {
// 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;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_path));
+
+ TestRequestInterceptor interceptor("update.extension");
+ interceptor.PushJobCallback(
+ TestRequestInterceptor::FileJob(
+ 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();
+ ASSERT_TRUE(new_version->IsValid());
+ base::Version old_version(old_version_number);
+ ASSERT_TRUE(old_version.IsValid());
+
+ EXPECT_EQ(1, new_version->CompareTo(old_version));
+
+ EXPECT_EQ(0u, interceptor.GetPendingSize());
}
IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionAllowedTypes) {
« no previous file with comments | « chrome/browser/policy/cloud/test_request_interceptor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698