chrome/browser/chromeos/customization/customization_document_unittest.cc - Issue 974713002: kiosk: Ensure launching latest version.

Unified Diff: chrome/browser/chromeos/customization/customization_document_unittest.cc

Issue 974713002: kiosk: Ensure launching latest version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix unittest compile Created 5 years, 10 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

Index: chrome/browser/chromeos/customization/customization_document_unittest.cc

diff --git a/chrome/browser/chromeos/customization/customization_document_unittest.cc b/chrome/browser/chromeos/customization/customization_document_unittest.cc

index f17c803a4a24a53cf030efc97d03974921d20b77..3e2342b64e4a754d96cb138a108bcda5f20e728e 100644

--- a/chrome/browser/chromeos/customization/customization_document_unittest.cc

+++ b/chrome/browser/chromeos/customization/customization_document_unittest.cc

@@ -179,12 +179,13 @@ class MockExternalProviderVisitor

public:

MockExternalProviderVisitor() {}

- MOCK_METHOD6(OnExternalExtensionFileFound,

+ MOCK_METHOD7(OnExternalExtensionFileFound,

bool(const std::string&,

const base::Version*,

const base::FilePath&,

extensions::Manifest::Location,

int,

+ bool,

bool));

MOCK_METHOD6(OnExternalExtensionUpdateUrlFound,

bool(const std::string&,

@@ -345,7 +346,7 @@ TEST_F(ServicesCustomizationDocumentTest, NoCustomizationIdInVpd) {

extensions::Extension::FROM_WEBSTORE |

extensions::Extension::WAS_INSTALLED_BY_DEFAULT));

- EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))

+ EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))

.Times(0);

EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))

.Times(0);

@@ -390,7 +391,7 @@ TEST_F(ServicesCustomizationDocumentTest, DefaultApps) {

extensions::Extension::FROM_WEBSTORE |

extensions::Extension::WAS_INSTALLED_BY_DEFAULT));

- EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))

+ EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))

.Times(0);

EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))

.Times(0);

@@ -401,7 +402,7 @@ TEST_F(ServicesCustomizationDocumentTest, DefaultApps) {

loader->StartLoading();

Mock::VerifyAndClearExpectations(&visitor);

- EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))

+ EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))

.Times(0);

EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))

.Times(2);

@@ -440,7 +441,7 @@ TEST_F(ServicesCustomizationDocumentTest, CustomizationManifestNotFound) {

extensions::Extension::FROM_WEBSTORE |

extensions::Extension::WAS_INSTALLED_BY_DEFAULT));

- EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))

+ EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))

.Times(0);

EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))

.Times(0);

@@ -451,7 +452,7 @@ TEST_F(ServicesCustomizationDocumentTest, CustomizationManifestNotFound) {

loader->StartLoading();

Mock::VerifyAndClearExpectations(&visitor);

- EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))

+ EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))

.Times(0);

EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))

.Times(0);

« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc » ('j') | no next file with comments »