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

chrome/test/remoting/remote_desktop_browsertest.cc

 // Copyright 2013 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/test/remoting/remote_desktop_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/test/remoting/key_code_conv.h"
 #include "chrome/test/remoting/page_load_notification_observer.h"
 #include "chrome/test/remoting/waiter.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "ui/base/window_open_disposition.h"
 
 namespace remoting {
 
 RemoteDesktopBrowserTest::RemoteDesktopBrowserTest()
     : extension_(NULL) {
 }
 
 RemoteDesktopBrowserTest::~RemoteDesktopBrowserTest() {}
 
@@ skipping 78 matching lines @@
 
   observer.Wait();
 }
 
 void RemoteDesktopBrowserTest::UninstallChromotingApp() {
   UninstallExtension(ChromotingID());
   extension_ = NULL;
 }
 
 void RemoteDesktopBrowserTest::VerifyChromotingLoaded(bool expected) {
-  const ExtensionSet* extensions = extension_service()->extensions();
+  const extensions::ExtensionSet* extensions =
+      extension_service()->extensions();
   scoped_refptr<const extensions::Extension> extension;
-  ExtensionSet::const_iterator iter;
   bool installed = false;
 
-  for (iter = extensions->begin(); iter != extensions->end(); ++iter) {
+  for (extensions::ExtensionSet::const_iterator iter = extensions->begin();
+       iter != extensions->end(); ++iter) {
     extension = *iter;
     // Is there a better way to recognize the chromoting extension
     // than name comparison?
     if (extension->name() == "Chromoting" ||
         extension->name() == "Chrome Remote Desktop") {
       installed = true;
       break;
     }
   }
 
@@ skipping 553 matching lines @@
 }
 
 // static
 bool RemoteDesktopBrowserTest::IsAuthenticatedInWindow(
     content::WebContents* web_contents) {
   return ExecuteScriptAndExtractBool(
       web_contents, "remoting.identity.isAuthenticated()");
 }
 
 }  // namespace remoting