summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/base/test_browser_window.h6
-rw-r--r--chrome/test/base/testing_profile.cc2
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index 3c75b0a..56c7e5d 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -12,6 +12,10 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/test/base/test_location_bar.h"
+namespace extensions {
+class Extension;
+}
+
// An implementation of BrowserWindow used for testing. TestBrowserWindow only
// contains a valid LocationBar, all other getters return NULL.
// See BrowserWithTestWindowTest for an example of using this class.
@@ -75,7 +79,7 @@ class TestBrowserWindow : public BrowserWindow {
TabContentsWrapper* tab_contents) OVERRIDE {}
virtual void ShowCreateChromeAppShortcutsDialog(
Profile* profile,
- const Extension* app) OVERRIDE {}
+ const extensions::Extension* app) OVERRIDE {}
virtual bool IsBookmarkBarVisible() const OVERRIDE;
virtual bool IsBookmarkBarAnimating() const OVERRIDE;
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 3aa61dc..334728e 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -536,7 +536,7 @@ net::URLRequestContextGetter* TestingProfile::GetRequestContextForRenderProcess(
ExtensionService* extension_service =
ExtensionSystem::Get(this)->extension_service();
if (extension_service) {
- const Extension* installed_app = extension_service->
+ const extensions::Extension* installed_app = extension_service->
GetInstalledAppForRenderer(renderer_child_id);
if (installed_app != NULL && installed_app->is_storage_isolated())
return GetRequestContextForIsolatedApp(installed_app->id());