Move Feature and Manifest to top-level extensions.

chrome/browser/sync/test/integration/apps_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/apps_helper.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
-#include "chrome/common/extensions/manifest.h"
+#include "extensions/common/manifest.h"
 
 using sync_datatype_helper::test;
 
 namespace {
 
 std::string CreateFakeAppName(int index) {
   return "fakeapp" + base::IntToString(index);
 }
 
 }  // namespace
@@ skipping 96 matching lines @@
   SetPageOrdinalForApp(destination, index, GetPageOrdinalForApp(source, index));
   SetAppLaunchOrdinalForApp(
       destination, index, GetAppLaunchOrdinalForApp(source, index));
 }
 
 void FixNTPOrdinalCollisions(Profile* profile) {
   SyncAppHelper::GetInstance()->FixNTPOrdinalCollisions(profile);
 }
 
 }  // namespace apps_helper