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

chrome/browser/chromeos/system_logs/chrome_internal_log_source.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/chromeos/system_logs/chrome_internal_log_source.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/about_sync_util.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_version_info.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"
 
 
 namespace {
 
 const char kSyncDataKey[] = "about_sync_data";
 const char kExtensionsListKey[] = "extensions";
 const char kChromeVersionTag[] = "CHROME VERSION";
 
 }  // namespace
 
@@ skipping 64 matching lines @@
       g_browser_process->profile_manager()->GetPrimaryUserProfile();
   if (!primary_profile)
     return;
 
   ExtensionService* service =
       extensions::ExtensionSystem::Get(primary_profile)->extension_service();
   if (!service)
     return;
 
   std::string extensions_list;
-  const ExtensionSet* extensions = service->extensions();
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  const extensions::ExtensionSet* extensions = service->extensions();
+  for (extensions::ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end();
        ++it) {
     const extensions::Extension* extension = it->get();
     if (extensions_list.empty()) {
       extensions_list = extension->name();
     } else {
       extensions_list += ", " + extension->name();
     }
   }
 
   if (!extensions_list.empty())
     (*response)[kExtensionsListKey] = extensions_list;
 }
 
 }  // namespace chromeos