| Index: content/public/browser/content_browser_client.h
|
| diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
| index bd3dc81f37444958ad749ebd8deb76947d8581c0..aae30ebc5c45ab90852a39084d160d48d0b602fa 100644
|
| --- a/content/public/browser/content_browser_client.h
|
| +++ b/content/public/browser/content_browser_client.h
|
| @@ -314,8 +314,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| // This is called on the IO thread.
|
| 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,
|
| ResourceContext* context,
|
| const std::vector<std::pair<int, int> >& render_views);
|
| @@ -333,7 +333,7 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| // This is called on the IO thread.
|
| virtual bool AllowWorkerIndexedDB(
|
| const GURL& url,
|
| - const string16& name,
|
| + const base::string16& name,
|
| ResourceContext* context,
|
| const std::vector<std::pair<int, int> >& render_views);
|
|
|
|
|