| Index: chrome/browser/ui/shell_dialogs_unittest.cc
|
| diff --git a/chrome/browser/ui/shell_dialogs_unittest.cc b/chrome/browser/ui/shell_dialogs_unittest.cc
|
| index 865648511afa47ffb434bd61a9f2de16341af596..0344dfc1beba848fe3ba3a9c74771cd98c731722 100644
|
| --- a/chrome/browser/ui/shell_dialogs_unittest.cc
|
| +++ b/chrome/browser/ui/shell_dialogs_unittest.cc
|
| @@ -7,13 +7,14 @@
|
| #include "base/string16.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/browser_process.h"
|
| -#include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
| +#include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/shell_dialogs.h"
|
| +#include "chrome/common/pref_names.h"
|
| #include "chrome/test/base/testing_browser_process.h"
|
| #include "chrome/test/base/testing_pref_service.h"
|
| -#include "chrome/common/pref_names.h"
|
| +#include "content/test/test_browser_thread.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| class FileSelectionUser : public SelectFileDialog::Listener {
|
| @@ -73,7 +74,7 @@ typedef testing::Test FileSelectionDialogTest;
|
| // file-selection dialogs disabled by policy.
|
| TEST_F(FileSelectionDialogTest, ExpectAsynchronousListenerCall) {
|
| MessageLoopForUI message_loop;
|
| - BrowserThread ui_thread(BrowserThread::UI, &message_loop);
|
| + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
|
|
|
| ScopedTestingLocalState local_state(
|
| static_cast<TestingBrowserProcess*>(g_browser_process));
|
|
|