Index: chrome/browser/chrome_content_browser_client.h |
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h |
index 3d596cb495654f33ff22b0f150a3681ffbbb91cc..cd468d979720a1f087ce9651dda20be6e3b7a7c9 100644 |
--- a/chrome/browser/chrome_content_browser_client.h |
+++ b/chrome/browser/chrome_content_browser_client.h |
@@ -134,8 +134,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
virtual bool AllowSaveLocalState(content::ResourceContext* context) OVERRIDE; |
virtual bool AllowWorkerDatabase( |
const GURL& url, |
- const string16& name, |
- const string16& display_name, |
+ const base::string16& name, |
+ const base::string16& display_name, |
unsigned long estimated_size, |
content::ResourceContext* context, |
const std::vector<std::pair<int, int> >& render_views) OVERRIDE; |
@@ -145,7 +145,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
const std::vector<std::pair<int, int> >& render_views) OVERRIDE; |
virtual bool AllowWorkerIndexedDB( |
const GURL& url, |
- const string16& name, |
+ const base::string16& name, |
content::ResourceContext* context, |
const std::vector<std::pair<int, int> >& render_views) OVERRIDE; |
virtual net::URLRequestContext* OverrideRequestContextForURL( |