Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Side by Side Diff: chrome/browser/ui/select_file_dialog_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/prefs/browser_prefs.h" 11 #include "chrome/browser/prefs/browser_prefs.h"
12 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/select_file_dialog.h" 14 #include "chrome/browser/ui/select_file_dialog.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/test/base/testing_browser_process.h" 16 #include "chrome/test/base/testing_browser_process.h"
17 #include "chrome/test/base/testing_pref_service.h" 17 #include "chrome/test/base/testing_pref_service.h"
18 #include "content/test/test_browser_thread.h" 18 #include "content/public/test/test_browser_thread.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 #if defined(USE_AURA) 21 #if defined(USE_AURA)
22 // http://crbug.com/105200 22 // http://crbug.com/105200
23 #define MAYBE_ExpectAsynchronousListenerCall DISABLED_ExpectAsynchronousListener Call 23 #define MAYBE_ExpectAsynchronousListenerCall DISABLED_ExpectAsynchronousListener Call
24 #else 24 #else
25 #define MAYBE_ExpectAsynchronousListenerCall ExpectAsynchronousListenerCall 25 #define MAYBE_ExpectAsynchronousListenerCall ExpectAsynchronousListenerCall
26 #endif 26 #endif
27 27
28 using content::BrowserThread; 28 using content::BrowserThread;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 scoped_ptr<FileSelectionUser> file_selection_user(new FileSelectionUser()); 92 scoped_ptr<FileSelectionUser> file_selection_user(new FileSelectionUser());
93 93
94 // Disallow file-selection dialogs. 94 // Disallow file-selection dialogs.
95 local_state.Get()->SetManagedPref( 95 local_state.Get()->SetManagedPref(
96 prefs::kAllowFileSelectionDialogs, 96 prefs::kAllowFileSelectionDialogs,
97 Value::CreateBooleanValue(false)); 97 Value::CreateBooleanValue(false));
98 98
99 file_selection_user->StartFileSelection(); 99 file_selection_user->StartFileSelection();
100 } 100 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/login/login_prompt_browsertest.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698