diff options
Diffstat (limited to 'chrome/test/base')
| -rw-r--r-- | chrome/test/base/testing_browser_process.cc | 4 | ||||
| -rw-r--r-- | chrome/test/base/testing_browser_process.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc index 0c3a254..7d1b999 100644 --- a/chrome/test/base/testing_browser_process.cc +++ b/chrome/test/base/testing_browser_process.cc @@ -394,9 +394,9 @@ memory::TabManager* TestingBrowserProcess::GetTabManager() { return nullptr; } -ShellIntegration::DefaultWebClientState +shell_integration::DefaultWebClientState TestingBrowserProcess::CachedDefaultWebClientState() { - return ShellIntegration::UNKNOWN_DEFAULT; + return shell_integration::UNKNOWN_DEFAULT; } void TestingBrowserProcess::SetSystemRequestContext( net::URLRequestContextGetter* context_getter) { diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h index 0a185e8..6ce6267 100644 --- a/chrome/test/base/testing_browser_process.h +++ b/chrome/test/base/testing_browser_process.h @@ -127,7 +127,7 @@ class TestingBrowserProcess : public BrowserProcess { gcm::GCMDriver* gcm_driver() override; memory::TabManager* GetTabManager() override; - ShellIntegration::DefaultWebClientState CachedDefaultWebClientState() + shell_integration::DefaultWebClientState CachedDefaultWebClientState() override; // Set the local state for tests. Consumer is responsible for cleaning it up |