| Index: chrome/browser/sync/test/integration/themes_helper.cc
|
| diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc
|
| index 67b41ff2986a4bcbda1e9e816444e12336c57799..dbfc0b17504eb25881dd2c300b82a2ab281707d2 100644
|
| --- a/chrome/browser/sync/test/integration/themes_helper.cc
|
| +++ b/chrome/browser/sync/test/integration/themes_helper.cc
|
| @@ -7,13 +7,12 @@
|
| #include "base/logging.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
|
| -#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
|
| -#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
|
| #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
|
| #include "chrome/browser/themes/theme_service.h"
|
| #include "chrome/browser/themes/theme_service_factory.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/manifest.h"
|
| +#include "extensions/common/id_util.h"
|
|
|
| using sync_datatype_helper::test;
|
|
|
| @@ -33,7 +32,7 @@ ThemeService* GetThemeService(Profile* profile) {
|
| namespace themes_helper {
|
|
|
| std::string GetCustomTheme(int index) {
|
| - return SyncExtensionHelper::GetInstance()->NameToId(MakeName(index));
|
| + return extensions::id_util::GenerateId(MakeName(index));
|
| }
|
|
|
| std::string GetThemeID(Profile* profile) {
|
|
|