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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 "chrome/browser/ui/chrome_select_file_policy.h" 5 #include "chrome/browser/ui/chrome_select_file_policy.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
11 #include "base/values.h" 10 #include "base/values.h"
12 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/prefs/browser_prefs.h" 12 #include "chrome/browser/prefs/browser_prefs.h"
14 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
15 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
16 #include "chrome/test/base/scoped_testing_local_state.h" 15 #include "chrome/test/base/scoped_testing_local_state.h"
17 #include "chrome/test/base/testing_browser_process.h" 16 #include "chrome/test/base/testing_browser_process.h"
17 #include "components/prefs/pref_service.h"
18 #include "content/public/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 #include "ui/shell_dialogs/select_file_dialog.h" 20 #include "ui/shell_dialogs/select_file_dialog.h"
21 21
22 #if defined(USE_AURA) 22 #if defined(USE_AURA)
23 // http://crbug.com/105200 23 // http://crbug.com/105200
24 #define MAYBE_ExpectAsynchronousListenerCall DISABLED_ExpectAsynchronousListener Call 24 #define MAYBE_ExpectAsynchronousListenerCall DISABLED_ExpectAsynchronousListener Call
25 #else 25 #else
26 #define MAYBE_ExpectAsynchronousListenerCall ExpectAsynchronousListenerCall 26 #define MAYBE_ExpectAsynchronousListenerCall ExpectAsynchronousListenerCall
27 #endif 27 #endif
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 TestingBrowserProcess::GetGlobal()); 95 TestingBrowserProcess::GetGlobal());
96 96
97 scoped_ptr<FileSelectionUser> file_selection_user(new FileSelectionUser()); 97 scoped_ptr<FileSelectionUser> file_selection_user(new FileSelectionUser());
98 98
99 // Disallow file-selection dialogs. 99 // Disallow file-selection dialogs.
100 local_state.Get()->SetManagedPref(prefs::kAllowFileSelectionDialogs, 100 local_state.Get()->SetManagedPref(prefs::kAllowFileSelectionDialogs,
101 new base::FundamentalValue(false)); 101 new base::FundamentalValue(false));
102 102
103 file_selection_user->StartFileSelection(); 103 file_selection_user->StartFileSelection();
104 } 104 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/chrome_select_file_policy.cc ('k') | chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698