| Index: content/public/browser/content_browser_client.cc
|
| diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
| index f105cc9a692fea5ff755541caa59639cb5cfb22c..b404a974e2ec2be6f5f8eab091522d0c66c04f12 100644
|
| --- a/content/public/browser/content_browser_client.cc
|
| +++ b/content/public/browser/content_browser_client.cc
|
| @@ -141,8 +141,8 @@ bool ContentBrowserClient::AllowSaveLocalState(ResourceContext* context) {
|
|
|
| bool ContentBrowserClient::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) {
|
| @@ -158,7 +158,7 @@ bool ContentBrowserClient::AllowWorkerFileSystem(
|
|
|
| bool ContentBrowserClient::AllowWorkerIndexedDB(
|
| const GURL& url,
|
| - const string16& name,
|
| + const base::string16& name,
|
| ResourceContext* context,
|
| const std::vector<std::pair<int, int> >& render_views) {
|
| return true;
|
|
|