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

chrome/browser/ui/webui/uber/uber_ui.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/webui/uber/uber_ui.h"
 
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_source.h"
 #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"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::RenderViewHost;
 using content::WebContents;
 
 namespace {
@@ skipping 27 matching lines @@
   source->AddString("settingsFrameURL",
                     ASCIIToUTF16(chrome::kChromeUISettingsFrameURL));
   source->AddString("settingsHost",
                     ASCIIToUTF16(chrome::kChromeUISettingsHost));
 
   return source;
 }
 
 // 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());
     extensions::URLOverrides::URLOverrideMap::const_iterator result =
         map.find(std::string(extensionType));
 
     if (result != map.end())
       return true;
   }
 
@@ skipping 130 matching lines @@
       web_ui()->CallJavascriptFunction(
           "uber_frame.setNavigationOverride",
           base::StringValue(chrome::kChromeUIHistoryHost),
           base::StringValue(overrides_history ? "yes" : "no"));
       break;
     }
     default:
       NOTREACHED();
   }
 }