| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 7a215a007dac17070e459d0d47801e2ff394e8a3..e6295a4b5b7cff79b8ea6951470ab7b75a41ed57 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -1680,8 +1680,8 @@ bool ChromeContentBrowserClient::AllowSaveLocalState(
|
|
|
| bool ChromeContentBrowserClient::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) {
|
| @@ -1725,7 +1725,7 @@ bool ChromeContentBrowserClient::AllowWorkerFileSystem(
|
|
|
| bool ChromeContentBrowserClient::AllowWorkerIndexedDB(
|
| const GURL& url,
|
| - const string16& name,
|
| + const base::string16& name,
|
| content::ResourceContext* context,
|
| const std::vector<std::pair<int, int> >& render_views) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|