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

Unified Diff: chrome/browser/extensions/extension_startup_browsertest.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 months 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/browser/extensions/extension_startup_browsertest.cc
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index d2a5f531dbe650bbcee59f393db56a47a782d768..c35ff720f2c3436d05832d6150d67738d8a8faa8 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -90,7 +90,7 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
int found_extensions = 0;
for (ExtensionSet::const_iterator it = service->extensions()->begin();
it != service->extensions()->end(); ++it)
- if ((*it)->location() != Extension::COMPONENT)
+ if ((*it)->location() != extensions::Extension::COMPONENT)
found_extensions++;
ASSERT_EQ(static_cast<uint32>(num_expected_extensions),
@@ -172,12 +172,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) {
// Keep a separate list of extensions for which to disable file access, since
// doing so reloads them.
- std::vector<const Extension*> extension_list;
+ std::vector<const extensions::Extension*> extension_list;
ExtensionService* service = browser()->profile()->GetExtensionService();
for (ExtensionSet::const_iterator it = service->extensions()->begin();
it != service->extensions()->end(); ++it) {
- if ((*it)->location() == Extension::COMPONENT)
+ if ((*it)->location() == extensions::Extension::COMPONENT)
continue;
if (service->AllowFileAccess(*it))
extension_list.push_back(*it);

Powered by Google App Engine
This is Rietveld 408576698