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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_sorting_unittest.cc

Issue 10920017: [Sync] Generalize StringOrdinal to handle ordinal_in_parent field (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix another compile error Created 8 years, 4 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/extensions/extension_sorting.cc ('k') | chrome/browser/extensions/extension_sync_data.h » ('j') | sync/api/string_ordinal.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_sorting_unittest.cc
diff --git a/chrome/browser/extensions/extension_sorting_unittest.cc b/chrome/browser/extensions/extension_sorting_unittest.cc
index 2388abbea2d489597540224a1e658bc67c433bf2..9f14a504186eec12108d8d7db8440cdf9f4fe1e9 100644
--- a/chrome/browser/extensions/extension_sorting_unittest.cc
+++ b/chrome/browser/extensions/extension_sorting_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/extension_prefs_unittest.h"
#include "chrome/browser/extensions/extension_sorting.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "sync/api/string_ordinal.h"
#include "testing/gtest/include/gtest/gtest.h"
using extensions::Extension;
@@ -24,7 +25,7 @@ class ExtensionSortingAppLocation : public ExtensionSortingTest {
extension_ = prefs_.AddExtension("not_an_app");
// Non-apps should not have any app launch ordinal or page ordinal.
prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
- false, StringOrdinal());
+ false, syncer::StringOrdinal());
}
virtual void Verify() OVERRIDE {
@@ -43,20 +44,21 @@ class ExtensionSortingAppLaunchOrdinal : public ExtensionSortingTest {
public:
virtual void Initialize() OVERRIDE {
// No extensions yet.
- StringOrdinal page = StringOrdinal::CreateInitialOrdinal();
- EXPECT_TRUE(StringOrdinal::CreateInitialOrdinal().Equal(
+ syncer::StringOrdinal page = syncer::StringOrdinal::CreateInitialOrdinal();
+ EXPECT_TRUE(syncer::StringOrdinal::CreateInitialOrdinal().Equals(
extension_sorting()->CreateNextAppLaunchOrdinal(page)));
extension_ = prefs_.AddApp("on_extension_installed");
EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
- false, StringOrdinal());
+ false, syncer::StringOrdinal());
}
virtual void Verify() OVERRIDE {
- StringOrdinal launch_ordinal =
+ syncer::StringOrdinal launch_ordinal =
extension_sorting()->GetAppLaunchOrdinal(extension_->id());
- StringOrdinal page_ordinal = StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal page_ordinal =
+ syncer::StringOrdinal::CreateInitialOrdinal();
// Extension should have been assigned a valid StringOrdinal.
EXPECT_TRUE(launch_ordinal.IsValid());
@@ -66,13 +68,13 @@ class ExtensionSortingAppLaunchOrdinal : public ExtensionSortingTest {
extension_sorting()->SetAppLaunchOrdinal(
extension_->id(),
extension_sorting()->CreateNextAppLaunchOrdinal(page_ordinal));
- StringOrdinal new_launch_ordinal =
+ syncer::StringOrdinal new_launch_ordinal =
extension_sorting()->GetAppLaunchOrdinal(extension_->id());
EXPECT_TRUE(launch_ordinal.LessThan(new_launch_ordinal));
// This extension doesn't exist, so it should return an invalid
// StringOrdinal.
- StringOrdinal invalid_app_launch_ordinal =
+ syncer::StringOrdinal invalid_app_launch_ordinal =
extension_sorting()->GetAppLaunchOrdinal("foo");
EXPECT_FALSE(invalid_app_launch_ordinal.IsValid());
EXPECT_EQ(-1, extension_sorting()->PageStringOrdinalAsInteger(
@@ -80,10 +82,10 @@ class ExtensionSortingAppLaunchOrdinal : public ExtensionSortingTest {
// The second page doesn't have any apps so its next launch ordinal should
// be the first launch ordinal.
- StringOrdinal next_page = page_ordinal.CreateAfter();
- StringOrdinal next_page_app_launch_ordinal =
+ syncer::StringOrdinal next_page = page_ordinal.CreateAfter();
+ syncer::StringOrdinal next_page_app_launch_ordinal =
extension_sorting()->CreateNextAppLaunchOrdinal(next_page);
- EXPECT_TRUE(next_page_app_launch_ordinal.Equal(
+ EXPECT_TRUE(next_page_app_launch_ordinal.Equals(
extension_sorting()->CreateFirstAppLaunchOrdinal(next_page)));
}
@@ -97,27 +99,27 @@ class ExtensionSortingPageOrdinal : public ExtensionSortingTest {
virtual void Initialize() OVERRIDE{
extension_ = prefs_.AddApp("page_ordinal");
// Install with a page preference.
- first_page_ = StringOrdinal::CreateInitialOrdinal();
+ first_page_ = syncer::StringOrdinal::CreateInitialOrdinal();
prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
false, first_page_);
- EXPECT_TRUE(first_page_.Equal(
+ EXPECT_TRUE(first_page_.Equals(
extension_sorting()->GetPageOrdinal(extension_->id())));
EXPECT_EQ(0, extension_sorting()->PageStringOrdinalAsInteger(first_page_));
scoped_refptr<Extension> extension2 = prefs_.AddApp("page_ordinal_2");
// Install without any page preference.
prefs()->OnExtensionInstalled(extension2.get(), Extension::ENABLED,
- false, StringOrdinal());
- EXPECT_TRUE(first_page_.Equal(
+ false, syncer::StringOrdinal());
+ EXPECT_TRUE(first_page_.Equals(
extension_sorting()->GetPageOrdinal(extension2->id())));
}
virtual void Verify() OVERRIDE {
// Set the page ordinal.
- StringOrdinal new_page = first_page_.CreateAfter();
+ syncer::StringOrdinal new_page = first_page_.CreateAfter();
extension_sorting()->SetPageOrdinal(extension_->id(), new_page);
// Verify the page ordinal.
EXPECT_TRUE(
- new_page.Equal(extension_sorting()->GetPageOrdinal(extension_->id())));
+ new_page.Equals(extension_sorting()->GetPageOrdinal(extension_->id())));
EXPECT_EQ(1, extension_sorting()->PageStringOrdinalAsInteger(new_page));
// This extension doesn't exist, so it should return an invalid
@@ -126,7 +128,7 @@ class ExtensionSortingPageOrdinal : public ExtensionSortingTest {
}
private:
- StringOrdinal first_page_;
+ syncer::StringOrdinal first_page_;
scoped_refptr<Extension> extension_;
};
TEST_F(ExtensionSortingPageOrdinal, ExtensionSortingPageOrdinal) {}
@@ -179,19 +181,20 @@ class ExtensionSortingInitialize
prefs()->extension_sorting()->Initialize(ids);
}
virtual void Verify() OVERRIDE {
- StringOrdinal first_ordinal = StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal first_ordinal =
+ syncer::StringOrdinal::CreateInitialOrdinal();
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- EXPECT_TRUE(first_ordinal.Equal(
+ EXPECT_TRUE(first_ordinal.Equals(
extension_sorting->GetAppLaunchOrdinal(ext1_->id())));
EXPECT_TRUE(first_ordinal.LessThan(
extension_sorting->GetAppLaunchOrdinal(ext2_->id())));
- EXPECT_TRUE(first_ordinal.Equal(
+ EXPECT_TRUE(first_ordinal.Equals(
extension_sorting->GetAppLaunchOrdinal(ext3_->id())));
- EXPECT_TRUE(first_ordinal.Equal(
+ EXPECT_TRUE(first_ordinal.Equals(
extension_sorting->GetPageOrdinal(ext1_->id())));
- EXPECT_TRUE(first_ordinal.Equal(
+ EXPECT_TRUE(first_ordinal.Equals(
extension_sorting->GetPageOrdinal(ext2_->id())));
EXPECT_TRUE(first_ordinal.LessThan(
extension_sorting->GetPageOrdinal(ext3_->id())));
@@ -211,7 +214,8 @@ class ExtensionSortingInitializeWithNoApps
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
// Make sure that the web store has valid ordinals.
- StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal initial_ordinal =
+ syncer::StringOrdinal::CreateInitialOrdinal();
extension_sorting->SetPageOrdinal(extension_misc::kWebStoreAppId,
initial_ordinal);
extension_sorting->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId,
@@ -223,7 +227,7 @@ class ExtensionSortingInitializeWithNoApps
virtual void Verify() OVERRIDE {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal page =
+ syncer::StringOrdinal page =
extension_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId);
EXPECT_TRUE(page.IsValid());
@@ -231,7 +235,7 @@ class ExtensionSortingInitializeWithNoApps
extension_sorting->ntp_ordinal_map_.find(page);
EXPECT_TRUE(page_it != extension_sorting->ntp_ordinal_map_.end());
- StringOrdinal app_launch =
+ syncer::StringOrdinal app_launch =
extension_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId);
EXPECT_TRUE(app_launch.IsValid());
@@ -290,7 +294,7 @@ class ExtensionSortingFixNTPCollisionsAllCollide
virtual ~ExtensionSortingFixNTPCollisionsAllCollide() {}
virtual void Initialize() OVERRIDE {
- repeated_ordinal_ = StringOrdinal::CreateInitialOrdinal();
+ repeated_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
@@ -307,12 +311,12 @@ class ExtensionSortingFixNTPCollisionsAllCollide
}
virtual void Verify() OVERRIDE {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal ext1_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext1_->id());
- StringOrdinal ext2_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext2_->id());
- StringOrdinal ext3_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext3_->id());
+ syncer::StringOrdinal ext1_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext1_->id());
+ syncer::StringOrdinal ext2_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext2_->id());
+ syncer::StringOrdinal ext3_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext3_->id());
// The overlapping extensions should have be adjusted so that they are
// sorted by their id.
@@ -324,16 +328,16 @@ class ExtensionSortingFixNTPCollisionsAllCollide
ext2_app_launch.LessThan(ext3_app_launch));
// The page ordinal should be unchanged.
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equals(
repeated_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equals(
repeated_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equals(
repeated_ordinal_));
}
private:
- StringOrdinal repeated_ordinal_;
+ syncer::StringOrdinal repeated_ordinal_;
};
TEST_F(ExtensionSortingFixNTPCollisionsAllCollide,
ExtensionSortingFixNTPCollisionsAllCollide) {}
@@ -345,8 +349,8 @@ class ExtensionSortingFixNTPCollisionsSomeCollideAtStart
virtual ~ExtensionSortingFixNTPCollisionsSomeCollideAtStart() {}
virtual void Initialize() OVERRIDE {
- first_ordinal_ = StringOrdinal::CreateInitialOrdinal();
- StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
+ first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
@@ -366,12 +370,12 @@ class ExtensionSortingFixNTPCollisionsSomeCollideAtStart
}
virtual void Verify() OVERRIDE {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal ext1_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext1_->id());
- StringOrdinal ext2_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext2_->id());
- StringOrdinal ext3_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext3_->id());
+ syncer::StringOrdinal ext1_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext1_->id());
+ syncer::StringOrdinal ext2_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext2_->id());
+ syncer::StringOrdinal ext3_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext3_->id());
// The overlapping extensions should have be adjusted so that they are
// sorted by their id, but they both should be before ext3, which wasn't
@@ -382,16 +386,16 @@ class ExtensionSortingFixNTPCollisionsSomeCollideAtStart
EXPECT_TRUE(ext2_app_launch.LessThan(ext3_app_launch));
// The page ordinal should be unchanged.
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equals(
first_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equals(
first_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equals(
first_ordinal_));
}
private:
- StringOrdinal first_ordinal_;
+ syncer::StringOrdinal first_ordinal_;
};
TEST_F(ExtensionSortingFixNTPCollisionsSomeCollideAtStart,
ExtensionSortingFixNTPCollisionsSomeCollideAtStart) {}
@@ -403,8 +407,8 @@ class ExtensionSortingFixNTPCollisionsSomeCollideAtEnd
virtual ~ExtensionSortingFixNTPCollisionsSomeCollideAtEnd() {}
virtual void Initialize() OVERRIDE {
- first_ordinal_ = StringOrdinal::CreateInitialOrdinal();
- StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
+ first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
@@ -424,12 +428,12 @@ class ExtensionSortingFixNTPCollisionsSomeCollideAtEnd
}
virtual void Verify() OVERRIDE {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal ext1_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext1_->id());
- StringOrdinal ext2_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext2_->id());
- StringOrdinal ext3_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext3_->id());
+ syncer::StringOrdinal ext1_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext1_->id());
+ syncer::StringOrdinal ext2_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext2_->id());
+ syncer::StringOrdinal ext3_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext3_->id());
// The overlapping extensions should have be adjusted so that they are
// sorted by their id, but they both should be after ext1, which wasn't
@@ -440,16 +444,16 @@ class ExtensionSortingFixNTPCollisionsSomeCollideAtEnd
ext2_app_launch.LessThan(ext3_app_launch));
// The page ordinal should be unchanged.
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equals(
first_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equals(
first_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equals(
first_ordinal_));
}
private:
- StringOrdinal first_ordinal_;
+ syncer::StringOrdinal first_ordinal_;
};
TEST_F(ExtensionSortingFixNTPCollisionsSomeCollideAtEnd,
ExtensionSortingFixNTPCollisionsSomeCollideAtEnd) {}
@@ -461,8 +465,8 @@ class ExtensionSortingFixNTPCollisionsTwoCollisions
virtual ~ExtensionSortingFixNTPCollisionsTwoCollisions() {}
virtual void Initialize() OVERRIDE {
- first_ordinal_ = StringOrdinal::CreateInitialOrdinal();
- StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
+ first_ordinal_ = syncer::StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal second_ordinal = first_ordinal_.CreateAfter();
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
@@ -483,14 +487,14 @@ class ExtensionSortingFixNTPCollisionsTwoCollisions
}
virtual void Verify() OVERRIDE {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal ext1_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext1_->id());
- StringOrdinal ext2_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext2_->id());
- StringOrdinal ext3_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext3_->id());
- StringOrdinal ext4_app_launch = extension_sorting->GetAppLaunchOrdinal(
- ext4_->id());
+ syncer::StringOrdinal ext1_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext1_->id());
+ syncer::StringOrdinal ext2_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext2_->id());
+ syncer::StringOrdinal ext3_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext3_->id());
+ syncer::StringOrdinal ext4_app_launch =
+ extension_sorting->GetAppLaunchOrdinal(ext4_->id());
// The overlapping extensions should have be adjusted so that they are
// sorted by their id, with |ext1| and |ext2| appearing before |ext3| and
@@ -506,18 +510,18 @@ class ExtensionSortingFixNTPCollisionsTwoCollisions
ext3_app_launch.LessThan(ext4_app_launch));
// The page ordinal should be unchanged.
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).Equals(
first_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext2_->id()).Equals(
first_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext3_->id()).Equals(
first_ordinal_));
- EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext4_->id()).Equal(
+ EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext4_->id()).Equals(
first_ordinal_));
}
private:
- StringOrdinal first_ordinal_;
+ syncer::StringOrdinal first_ordinal_;
};
TEST_F(ExtensionSortingFixNTPCollisionsTwoCollisions,
ExtensionSortingFixNTPCollisionsTwoCollisions) {}
@@ -532,10 +536,11 @@ class ExtensionSortingEnsureValidOrdinals :
virtual void Verify() {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- // Give ext1 invalid ordinals and then check that EnsureValidOridnals fixes
+ // Give ext1 invalid ordinals and then check that EnsureValidOrdinals fixes
// them.
- extension_sorting->SetAppLaunchOrdinal(ext1_->id(), StringOrdinal());
- extension_sorting->SetPageOrdinal(ext1_->id(), StringOrdinal());
+ extension_sorting->SetAppLaunchOrdinal(ext1_->id(),
+ syncer::StringOrdinal());
+ extension_sorting->SetPageOrdinal(ext1_->id(), syncer::StringOrdinal());
extension_sorting->EnsureValidOrdinals(ext1_->id());
@@ -558,7 +563,8 @@ class ExtensionSortingPageOrdinalMapping :
std::string ext_2 = "ext_2";
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal first_ordinal = StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal first_ordinal =
+ syncer::StringOrdinal::CreateInitialOrdinal();
// Ensure attempting to removing a mapping with an invalid page doesn't
// modify the map.
@@ -622,7 +628,7 @@ class ExtensionSortingPreinstalledAppsBase :
prefs()->OnExtensionInstalled(app1_scoped_.get(),
Extension::ENABLED,
false,
- StringOrdinal());
+ syncer::StringOrdinal());
app2_scoped_ = Extension::Create(
prefs_.temp_dir().AppendASCII("app2_"), Extension::EXTERNAL_PREF,
@@ -630,7 +636,7 @@ class ExtensionSortingPreinstalledAppsBase :
prefs()->OnExtensionInstalled(app2_scoped_.get(),
Extension::ENABLED,
false,
- StringOrdinal());
+ syncer::StringOrdinal());
app1_ = app1_scoped_.get();
app2_ = app2_scoped_.get();
@@ -655,23 +661,25 @@ class ExtensionSortingGetMinOrMaxAppLaunchOrdinalsOnPage :
virtual void Initialize() OVERRIDE {}
virtual void Verify() OVERRIDE {
- StringOrdinal page = StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal page = syncer::StringOrdinal::CreateInitialOrdinal();
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal min = extension_sorting->GetMinOrMaxAppLaunchOrdinalsOnPage(
- page,
- ExtensionSorting::MIN_ORDINAL);
- StringOrdinal max = extension_sorting->GetMinOrMaxAppLaunchOrdinalsOnPage(
- page,
- ExtensionSorting::MAX_ORDINAL);
+ syncer::StringOrdinal min =
+ extension_sorting->GetMinOrMaxAppLaunchOrdinalsOnPage(
+ page,
+ ExtensionSorting::MIN_ORDINAL);
+ syncer::StringOrdinal max =
+ extension_sorting->GetMinOrMaxAppLaunchOrdinalsOnPage(
+ page,
+ ExtensionSorting::MAX_ORDINAL);
EXPECT_TRUE(min.IsValid());
EXPECT_TRUE(max.IsValid());
EXPECT_TRUE(min.LessThan(max));
// Ensure that the min and max values aren't set for empty pages.
- min = StringOrdinal();
- max = StringOrdinal();
- StringOrdinal empty_page = page.CreateAfter();
+ min = syncer::StringOrdinal();
+ max = syncer::StringOrdinal();
+ syncer::StringOrdinal empty_page = page.CreateAfter();
EXPECT_FALSE(min.IsValid());
EXPECT_FALSE(max.IsValid());
min = extension_sorting->GetMinOrMaxAppLaunchOrdinalsOnPage(
@@ -698,7 +706,8 @@ class ExtensionSortingKeepEmptyStringOrdinalPages :
virtual void Initialize() {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal first_page = StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal first_page =
+ syncer::StringOrdinal::CreateInitialOrdinal();
extension_sorting->SetPageOrdinal(app1_->id(), first_page);
EXPECT_EQ(0, extension_sorting->PageStringOrdinalAsInteger(first_page));
@@ -719,11 +728,11 @@ class ExtensionSortingKeepEmptyStringOrdinalPages :
extension_sorting->SetPageOrdinal(app2_->id(), last_page_);
EXPECT_EQ(2, extension_sorting->PageStringOrdinalAsInteger(last_page_));
EXPECT_TRUE(
- last_page_.Equal(extension_sorting->PageIntegerAsStringOrdinal(2)));
+ last_page_.Equals(extension_sorting->PageIntegerAsStringOrdinal(2)));
}
private:
- StringOrdinal last_page_;
+ syncer::StringOrdinal last_page_;
};
TEST_F(ExtensionSortingKeepEmptyStringOrdinalPages,
ExtensionSortingKeepEmptyStringOrdinalPages) {}
@@ -737,7 +746,8 @@ class ExtensionSortingMakesFillerOrdinals :
virtual void Initialize() {
ExtensionSorting* extension_sorting = prefs()->extension_sorting();
- StringOrdinal first_page = StringOrdinal::CreateInitialOrdinal();
+ syncer::StringOrdinal first_page =
+ syncer::StringOrdinal::CreateInitialOrdinal();
extension_sorting->SetPageOrdinal(app1_->id(), first_page);
EXPECT_EQ(0, extension_sorting->PageStringOrdinalAsInteger(first_page));
}
@@ -748,11 +758,13 @@ class ExtensionSortingMakesFillerOrdinals :
// on them, this test simulates dropping of an app on the 1st and 4th empty
// pages (3rd and 6th pages by index) to ensure we don't crash and that
// filler ordinals are created as needed. See: http://crbug.com/122214
- StringOrdinal page_three = extension_sorting->PageIntegerAsStringOrdinal(2);
+ syncer::StringOrdinal page_three =
+ extension_sorting->PageIntegerAsStringOrdinal(2);
extension_sorting->SetPageOrdinal(app1_->id(), page_three);
EXPECT_EQ(2, extension_sorting->PageStringOrdinalAsInteger(page_three));
- StringOrdinal page_six = extension_sorting->PageIntegerAsStringOrdinal(5);
+ syncer::StringOrdinal page_six =
+ extension_sorting->PageIntegerAsStringOrdinal(5);
extension_sorting->SetPageOrdinal(app1_->id(), page_six);
EXPECT_EQ(5, extension_sorting->PageStringOrdinalAsInteger(page_six));
}
« no previous file with comments | « chrome/browser/extensions/extension_sorting.cc ('k') | chrome/browser/extensions/extension_sync_data.h » ('j') | sync/api/string_ordinal.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698