| Index: chrome/browser/extensions/extension_sync_data_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_sync_data_unittest.cc b/chrome/browser/extensions/extension_sync_data_unittest.cc
|
| index 637137d855c45df77ca00f9b385987a5c570c928..46b35493c1546fe4a4bb908dfda63496111ace5d 100644
|
| --- a/chrome/browser/extensions/extension_sync_data_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_sync_data_unittest.cc
|
| @@ -14,24 +14,11 @@
|
|
|
| namespace {
|
|
|
| -#if defined(OS_WIN)
|
| -const base::FilePath::CharType kExtensionFilePath[] =
|
| - FILE_PATH_LITERAL("c:\\foo");
|
| -#elif defined(OS_POSIX)
|
| -const base::FilePath::CharType kExtensionFilePath[] = FILE_PATH_LITERAL("/foo");
|
| -#endif
|
| -
|
| const char kValidId[] = "abcdefghijklmnopabcdefghijklmnop";
|
| -const char kValidVersion[] = "0.0.0.0";
|
| -const char kVersion1[] = "1.0.0.1";
|
| -const char kVersion2[] = "1.0.1.0";
|
| -const char kVersion3[] = "1.1.0.0";
|
| -const char kValidUpdateUrl1[] =
|
| - "http://clients2.google.com/service/update2/crx";
|
| -const char kValidUpdateUrl2[] =
|
| +const char kVersion[] = "1.0.0.1";
|
| +const char kValidUpdateUrl[] =
|
| "https://clients2.google.com/service/update2/crx";
|
| const char kName[] = "MyExtension";
|
| -const char kName2[] = "MyExtension2";
|
|
|
| class ExtensionSyncDataTest : public testing::Test {
|
| };
|
| @@ -40,10 +27,10 @@ TEST_F(ExtensionSyncDataTest, SyncDataToExtensionSyncDataForExtension) {
|
| sync_pb::EntitySpecifics entity;
|
| sync_pb::ExtensionSpecifics* extension_specifics = entity.mutable_extension();
|
| extension_specifics->set_id(kValidId);
|
| - extension_specifics->set_update_url(kValidUpdateUrl2);
|
| + extension_specifics->set_update_url(kValidUpdateUrl);
|
| extension_specifics->set_enabled(false);
|
| extension_specifics->set_incognito_enabled(true);
|
| - extension_specifics->set_version(kVersion1);
|
| + extension_specifics->set_version(kVersion);
|
| extension_specifics->set_name(kName);
|
| syncer::SyncData sync_data =
|
| syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity);
|
| @@ -65,10 +52,10 @@ TEST_F(ExtensionSyncDataTest, ExtensionSyncDataToSyncDataForExtension) {
|
| sync_pb::EntitySpecifics entity;
|
| sync_pb::ExtensionSpecifics* input_extension = entity.mutable_extension();
|
| input_extension->set_id(kValidId);
|
| - input_extension->set_update_url(kValidUpdateUrl2);
|
| + input_extension->set_update_url(kValidUpdateUrl);
|
| input_extension->set_enabled(true);
|
| input_extension->set_incognito_enabled(false);
|
| - input_extension->set_version(kVersion1);
|
| + input_extension->set_version(kVersion);
|
| input_extension->set_name(kName);
|
| syncer::SyncData sync_data =
|
| syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity);
|
|
|