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 201b62f381086329be983f32337506b0f669349d..f8b278422aeb9336195a12d66424b6142accc62f 100644 |
--- a/chrome/browser/extensions/extension_sorting_unittest.cc |
+++ b/chrome/browser/extensions/extension_sorting_unittest.cc |
@@ -25,7 +25,7 @@ class ExtensionSortingTest : public extensions::ExtensionPrefsTest { |
class ExtensionSortingAppLocation : public ExtensionSortingTest { |
public: |
virtual void Initialize() OVERRIDE { |
- extension_ = prefs_.AddExtension("not_an_app"); |
+ extension_ = prefs_->AddExtension("not_an_app"); |
// Non-apps should not have any app launch ordinal or page ordinal. |
prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED, |
syncer::StringOrdinal()); |
@@ -51,7 +51,7 @@ class ExtensionSortingAppLaunchOrdinal : public ExtensionSortingTest { |
EXPECT_TRUE(syncer::StringOrdinal::CreateInitialOrdinal().Equals( |
extension_sorting()->CreateNextAppLaunchOrdinal(page))); |
- extension_ = prefs_.AddApp("on_extension_installed"); |
+ extension_ = prefs_->AddApp("on_extension_installed"); |
EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id())); |
prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED, |
syncer::StringOrdinal()); |
@@ -100,7 +100,7 @@ TEST_F(ExtensionSortingAppLaunchOrdinal, ExtensionSortingAppLaunchOrdinal) {} |
class ExtensionSortingPageOrdinal : public ExtensionSortingTest { |
public: |
virtual void Initialize() OVERRIDE { |
- extension_ = prefs_.AddApp("page_ordinal"); |
+ extension_ = prefs_->AddApp("page_ordinal"); |
// Install with a page preference. |
first_page_ = syncer::StringOrdinal::CreateInitialOrdinal(); |
prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED, |
@@ -109,7 +109,7 @@ class ExtensionSortingPageOrdinal : public ExtensionSortingTest { |
extension_sorting()->GetPageOrdinal(extension_->id()))); |
EXPECT_EQ(0, extension_sorting()->PageStringOrdinalAsInteger(first_page_)); |
- scoped_refptr<Extension> extension2 = prefs_.AddApp("page_ordinal_2"); |
+ scoped_refptr<Extension> extension2 = prefs_->AddApp("page_ordinal_2"); |
// Install without any page preference. |
prefs()->OnExtensionInstalled(extension2.get(), Extension::ENABLED, |
syncer::StringOrdinal()); |
@@ -627,14 +627,14 @@ class ExtensionSortingPreinstalledAppsBase |
std::string error; |
app1_scoped_ = Extension::Create( |
- prefs_.temp_dir().AppendASCII("app1_"), Extension::EXTERNAL_PREF, |
+ prefs_->temp_dir().AppendASCII("app1_"), Extension::EXTERNAL_PREF, |
simple_dict, Extension::NO_FLAGS, &error); |
prefs()->OnExtensionInstalled(app1_scoped_.get(), |
Extension::ENABLED, |
syncer::StringOrdinal()); |
app2_scoped_ = Extension::Create( |
- prefs_.temp_dir().AppendASCII("app2_"), Extension::EXTERNAL_PREF, |
+ prefs_->temp_dir().AppendASCII("app2_"), Extension::EXTERNAL_PREF, |
simple_dict, Extension::NO_FLAGS, &error); |
prefs()->OnExtensionInstalled(app2_scoped_.get(), |
Extension::ENABLED, |
@@ -804,7 +804,7 @@ class ExtensionSortingDefaultOrdinalsBase : public ExtensionSortingTest { |
std::string errors; |
scoped_refptr<Extension> app = Extension::Create( |
- prefs_.temp_dir().AppendASCII(name), Extension::EXTERNAL_PREF, |
+ prefs_->temp_dir().AppendASCII(name), Extension::EXTERNAL_PREF, |
simple_dict, Extension::NO_FLAGS, &errors); |
EXPECT_TRUE(app) << errors; |
EXPECT_TRUE(Extension::IdIsValid(app->id())); |
@@ -931,7 +931,7 @@ class ExtensionSortingDefaultOrdinalNoCollision |
protected: |
virtual void SetupUserOrdinals() { |
- other_app_ = prefs_.AddApp("other_app"); |
+ other_app_ = prefs_->AddApp("other_app"); |
// Creates a collision. |
ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
extension_sorting->SetPageOrdinal(other_app_->id(), default_page_ordinal_); |