summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager/task_manager_browsertest.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
commit1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch)
treebb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/task_manager/task_manager_browsertest.cc
parente2a374f50043586ff684e0720bbbd99b9aa15c07 (diff)
downloadchromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2
Move Extension into extensions namespace
BUG=117262 TBR=aa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10375021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/task_manager_browsertest.cc')
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index f049e5d..e19c6fb 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -254,7 +254,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("packaged_app")));
ExtensionService* service = browser()->profile()->GetExtensionService();
- const Extension* extension =
+ const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
// Browser and the New Tab Page.
@@ -422,7 +422,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ReloadExtension) {
EXPECT_TRUE(model()->GetResourceExtension(1) == NULL);
ASSERT_TRUE(model()->GetResourceExtension(2) != NULL);
- const Extension* extension = model()->GetResourceExtension(2);
+ const extensions::Extension* extension = model()->GetResourceExtension(2);
ASSERT_TRUE(extension != NULL);
// Reload the extension a few times and make sure our resource count