Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: chrome/test/remoting/remote_desktop_browsertest.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Removed unused includes, added includes where missing Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/remoting/remote_desktop_browsertest.cc
diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc
index 2a03c2d2ef80fe0b402d97c95b7b559faeade3ff..58d659306e0d4e1d1e26a05a22ab17d3f88fea51 100644
--- a/chrome/test/remoting/remote_desktop_browsertest.cc
+++ b/chrome/test/remoting/remote_desktop_browsertest.cc
@@ -18,6 +18,7 @@
#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 {
@@ -116,12 +117,13 @@ void RemoteDesktopBrowserTest::UninstallChromotingApp() {
}
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?

Powered by Google App Engine
This is Rietveld 408576698