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

Unified Diff: chrome/browser/sync/test/integration/sync_extension_helper.cc

Issue 10920017: [Sync] Generalize StringOrdinal to handle ordinal_in_parent field (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Relax tests Created 8 years, 3 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/sync/test/integration/sync_extension_helper.cc
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index b4c0f1db4d4bfc871cd2949620c512d01d91d4d2..0b05557566612c531089d72fb1fe003f92114777 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -13,11 +13,11 @@
#include "chrome/browser/extensions/pending_extension_info.h"
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/string_ordinal.h"
-#include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "sync/api/string_ordinal.h"
#include "testing/gtest/include/gtest/gtest.h"
using extensions::Extension;
@@ -71,7 +71,7 @@ std::string SyncExtensionHelper::InstallExtension(
return "";
}
profile->GetExtensionService()->OnExtensionInstalled(
- extension, extension->UpdatesFromGallery(), StringOrdinal());
+ extension, extension->UpdatesFromGallery(), syncer::StringOrdinal());
return extension->id();
}

Powered by Google App Engine
This is Rietveld 408576698