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

Side by Side Diff: chrome/browser/sync/glue/extension_util_unittest.cc

Issue 6852029: [Sync] Move some extension-sync-related logic to ExtensionService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address asargent's comments Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/glue/extension_util.h" 5 #include "chrome/browser/sync/glue/extension_util.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/extensions/mock_extension_service.h" 9 #include "chrome/browser/extensions/mock_extension_service.h"
10 #include "chrome/browser/sync/protocol/extension_specifics.pb.h" 10 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 sync_pb::ExtensionSpecifics specifics; 413 sync_pb::ExtensionSpecifics specifics;
414 GetExtensionSpecifics(*extension, mock_extension_service, &specifics); 414 GetExtensionSpecifics(*extension, mock_extension_service, &specifics);
415 EXPECT_EQ(extension->id(), specifics.id()); 415 EXPECT_EQ(extension->id(), specifics.id());
416 EXPECT_EQ(extension->VersionString(), kValidVersion); 416 EXPECT_EQ(extension->VersionString(), kValidVersion);
417 EXPECT_EQ(extension->update_url().spec(), kValidUpdateUrl1); 417 EXPECT_EQ(extension->update_url().spec(), kValidUpdateUrl1);
418 EXPECT_TRUE(specifics.enabled()); 418 EXPECT_TRUE(specifics.enabled());
419 EXPECT_FALSE(specifics.incognito_enabled()); 419 EXPECT_FALSE(specifics.incognito_enabled());
420 EXPECT_EQ(kName, specifics.name()); 420 EXPECT_EQ(kName, specifics.name());
421 } 421 }
422 422
423 TEST_F(ExtensionUtilTest, IsExtensionOutdated) {
424 FilePath file_path(kExtensionFilePath);
425 scoped_refptr<Extension> extension(
426 MakeSyncableExtension(kVersion2, kValidUpdateUrl1, kName, file_path));
427 sync_pb::ExtensionSpecifics specifics;
428 specifics.set_id(kValidId);
429 specifics.set_update_url(kValidUpdateUrl1);
430
431 specifics.set_version(kVersion1);
432 EXPECT_FALSE(IsExtensionOutdated(*extension, specifics));
433 specifics.set_version(kVersion2);
434 EXPECT_FALSE(IsExtensionOutdated(*extension, specifics));
435 specifics.set_version(kVersion3);
436 EXPECT_TRUE(IsExtensionOutdated(*extension, specifics));
437 }
438
439 // TODO(akalin): Make ExtensionService/ExtensionUpdater testable 423 // TODO(akalin): Make ExtensionService/ExtensionUpdater testable
440 // enough to be able to write a unittest for SetExtensionProperties(). 424 // enough to be able to write a unittest for SetExtensionProperties().
441 425
442 TEST_F(ExtensionUtilTest, MergeExtensionSpecificsWithUserProperties) { 426 TEST_F(ExtensionUtilTest, MergeExtensionSpecificsWithUserProperties) {
443 sync_pb::ExtensionSpecifics merged_specifics; 427 sync_pb::ExtensionSpecifics merged_specifics;
444 merged_specifics.set_id(kValidId); 428 merged_specifics.set_id(kValidId);
445 merged_specifics.set_update_url(kValidUpdateUrl1); 429 merged_specifics.set_update_url(kValidUpdateUrl1);
446 merged_specifics.set_enabled(true); 430 merged_specifics.set_enabled(true);
447 merged_specifics.set_incognito_enabled(false); 431 merged_specifics.set_incognito_enabled(false);
448 merged_specifics.set_version(kVersion2); 432 merged_specifics.set_version(kVersion2);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 { 479 {
496 sync_pb::ExtensionSpecifics result = merged_specifics; 480 sync_pb::ExtensionSpecifics result = merged_specifics;
497 MergeExtensionSpecifics(specifics, true, &result); 481 MergeExtensionSpecifics(specifics, true, &result);
498 EXPECT_TRUE(AreExtensionSpecificsEqual(result, specifics)); 482 EXPECT_TRUE(AreExtensionSpecificsEqual(result, specifics));
499 } 483 }
500 } 484 }
501 485
502 } // namespace 486 } // namespace
503 487
504 } // namespace browser_sync 488 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/extension_util.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698