diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 21:52:31 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 21:52:31 +0000 |
| commit | e9f541ab939ab67b0b4c90f362001201fe0804ad (patch) | |
| tree | f7015983be2f8a8ae737a336aee458f3d53a614a /chrome/browser/automation/testing_automation_provider.cc | |
| parent | 65431cb6800bf5ac61e4a2aacc52e5e6c4d39469 (diff) | |
| download | chromium_src-e9f541ab939ab67b0b4c90f362001201fe0804ad.zip chromium_src-e9f541ab939ab67b0b4c90f362001201fe0804ad.tar.gz chromium_src-e9f541ab939ab67b0b4c90f362001201fe0804ad.tar.bz2 | |
Move extension_error_utils.* and url_pattern_set.* into
top-level extensions dir.
BUG=159265
TBR=ben@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/11312228
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/testing_automation_provider.cc')
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index a9a2adf..d572390 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -127,7 +127,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/permission_set.h" -#include "chrome/common/extensions/url_pattern_set.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -148,6 +147,7 @@ #include "content/public/common/geoposition.h" #include "content/public/common/ssl_status.h" #include "extensions/common/url_pattern.h" +#include "extensions/common/url_pattern_set.h" #include "net/cookies/cookie_store.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/base/events/event_constants.h" @@ -3734,14 +3734,14 @@ void TestingAutomationProvider::InstallExtension( namespace { ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) { - URLPatternSet pattern_set; + extensions::URLPatternSet pattern_set; if (effective_perm) pattern_set = ext->GetEffectiveHostPermissions(); else pattern_set = ext->GetActivePermissions()->explicit_hosts(); ListValue* permissions = new ListValue; - for (URLPatternSet::const_iterator perm = pattern_set.begin(); + for (extensions::URLPatternSet::const_iterator perm = pattern_set.begin(); perm != pattern_set.end(); ++perm) { permissions->Append(new StringValue(perm->GetAsString())); } |