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

chrome/browser/ui/webui/uber/uber_ui.cc

Index: chrome/browser/ui/webui/uber/uber_ui.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index a55842d66b65cf3c1f1fe72e0899342b8c409416..da6daaaa011d457e6189f632ad3ead5a6f41c0c2 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
@@ -21,6 +20,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "extensions/common/extension_set.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -68,10 +68,10 @@ content::WebUIDataSource* CreateUberHTMLSource() {
 
 // Determines whether the user has an active extension of the given type.
 bool HasExtensionType(Profile* profile, const char* extensionType) {
-  const ExtensionSet* extensionSet =
+  const extensions::ExtensionSet* extensionSet =
       profile->GetExtensionService()->extensions();
 
-  for (ExtensionSet::const_iterator iter = extensionSet->begin();
+  for (extensions::ExtensionSet::const_iterator iter = extensionSet->begin();
        iter != extensionSet->end(); ++iter) {
     extensions::URLOverrides::URLOverrideMap map =
         extensions::URLOverrides::GetChromeURLOverrides(iter->get());