Move c/c/e/extension_set to top-level extensions/

chrome/browser/sync/test/integration/extension_settings_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/extension_settings_helper.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_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/value_store/value_store.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 using content::BrowserThread;
 using sync_datatype_helper::test;
 
 namespace extension_settings_helper {
 
 namespace {
 
 std::string ToJson(const Value& value) {
   std::string json;
@@ skipping 17 matching lines @@
   scoped_ptr<DictionaryValue> settings(new DictionaryValue());
   profile->GetExtensionService()->settings_frontend()->RunWithStorage(
       id,
       extensions::settings_namespace::SYNC,
       base::Bind(&GetAllSettingsOnFileThread, settings.get(), &signal));
   signal.Wait();
   return settings.Pass();
 }
 
 bool AreSettingsSame(Profile* expected_profile, Profile* actual_profile) {
-  const ExtensionSet* extensions =
+  const extensions::ExtensionSet* extensions =
       expected_profile->GetExtensionService()->extensions();
   if (extensions->size() !=
       actual_profile->GetExtensionService()->extensions()->size()) {
     ADD_FAILURE();
     return false;
   }
 
   bool same = true;
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator it = extensions->begin();
       it != extensions->end(); ++it) {
     const std::string& id = (*it)->id();
     scoped_ptr<DictionaryValue> expected(GetAllSettings(expected_profile, id));
     scoped_ptr<DictionaryValue> actual(GetAllSettings(actual_profile, id));
     if (!expected->Equals(actual.get())) {
       ADD_FAILURE() <<
           "Expected " << ToJson(*expected) << " got " << ToJson(*actual);
       same = false;
     }
   }
@@ skipping 32 matching lines @@
   bool all_profiles_same = true;
   for (int i = 0; i < test()->num_clients(); ++i) {
     // &= so that all profiles are tested; analogous to EXPECT over ASSERT.
     all_profiles_same &=
         AreSettingsSame(test()->verifier(), test()->GetProfile(i));
   }
   return all_profiles_same;
 }
 
 }  // namespace extension_settings_helper