Move Feature and Manifest to top-level extensions.

chrome/browser/ui/app_list/apps_model_builder_unittest.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/ui/app_list/apps_model_builder.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "extensions/common/manifest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_item_model.h"
 
 namespace {
 
 const char kHostedAppId[] = "dceacbkfkmllgmjmbhgkpjegnodmildf";
 const char kPackagedApp1Id[] = "emfkafnhnpcmabnnkckkchdilgeoekbo";
 const char kPackagedApp2Id[] = "jlklkagmeajbjiobondfhiekepofmljl";
 
 // Get a string of all apps in |model| joined with ','.
@@ skipping 243 matching lines @@
 
   // By default, conflicted items are sorted by their app ids.
   EXPECT_EQ(std::string("Hosted App,Packaged App 1,Packaged App 2"),
             GetModelContent(model.get()));
 
   // Move hosted app between app1 and app2 and it should not crash.
   service_->OnExtensionMoved(kHostedAppId, kPackagedApp1Id, kPackagedApp2Id);
   EXPECT_EQ(std::string("Packaged App 1,Hosted App,Packaged App 2"),
             GetModelContent(model.get()));
 }