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

chrome/browser/devtools/devtools_window.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/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 47 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/url_constants.h"
+#include "extensions/common/extension_set.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::DictionaryValue;
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 
 
 // DevToolsConfirmInfoBarDelegate ---------------------------------------------
 
@@ skipping 1387 matching lines @@
       CallClientFunction("WebInspector.setInspectedTabId", &tabId, NULL, NULL);
     }
   }
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   const ExtensionService* extension_service = extensions::ExtensionSystem::Get(
       profile->GetOriginalProfile())->extension_service();
   if (!extension_service)
     return;
-  const ExtensionSet* extensions = extension_service->extensions();
+  const extensions::ExtensionSet* extensions = extension_service->extensions();
 
   ListValue results;
-  for (ExtensionSet::const_iterator extension(extensions->begin());
+  for (extensions::ExtensionSet::const_iterator extension(extensions->begin());
        extension != extensions->end(); ++extension) {
     if (extensions::ManifestURL::GetDevToolsPage(extension->get()).is_empty())
       continue;
     DictionaryValue* extension_info = new DictionaryValue();
     extension_info->Set(
         "startPage",
         new StringValue(
             extensions::ManifestURL::GetDevToolsPage(extension->get()).spec()));
     extension_info->Set("name", new StringValue((*extension)->name()));
     extension_info->Set(
@@ skipping 47 matching lines @@
   return inspected_contents_observer_ ?
       inspected_contents_observer_->web_contents() : NULL;
 }
 
 void DevToolsWindow::DocumentOnLoadCompletedInMainFrame() {
   is_loaded_ = true;
   UpdateTheme();
   DoAction();
   AddDevToolsExtensionsToClient();
 }