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

Side by Side Diff: chrome/browser/policy/configuration_policy_pref_store_unittest.cc

Issue 8135001: Fixed behavior of the bookmark bar visibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DCHECK_EQ instead of DCHECK Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "chrome/browser/policy/configuration_policy_pref_store.h" 7 #include "chrome/browser/policy/configuration_policy_pref_store.h"
8 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 8 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
9 #include "chrome/browser/prefs/incognito_mode_prefs.h" 9 #include "chrome/browser/prefs/incognito_mode_prefs.h"
10 #include "chrome/browser/prefs/proxy_config_dictionary.h" 10 #include "chrome/browser/prefs/proxy_config_dictionary.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 prefs::kDefaultBrowserSettingEnabled), 231 prefs::kDefaultBrowserSettingEnabled),
232 TypeAndName(kPolicyDisable3DAPIs, 232 TypeAndName(kPolicyDisable3DAPIs,
233 prefs::kDisable3DAPIs), 233 prefs::kDisable3DAPIs),
234 TypeAndName(kPolicyTranslateEnabled, 234 TypeAndName(kPolicyTranslateEnabled,
235 prefs::kEnableTranslate), 235 prefs::kEnableTranslate),
236 TypeAndName(kPolicyAllowOutdatedPlugins, 236 TypeAndName(kPolicyAllowOutdatedPlugins,
237 prefs::kPluginsAllowOutdated), 237 prefs::kPluginsAllowOutdated),
238 TypeAndName(kPolicyAlwaysAuthorizePlugins, 238 TypeAndName(kPolicyAlwaysAuthorizePlugins,
239 prefs::kPluginsAlwaysAuthorize), 239 prefs::kPluginsAlwaysAuthorize),
240 TypeAndName(kPolicyBookmarkBarEnabled, 240 TypeAndName(kPolicyBookmarkBarEnabled,
241 prefs::kEnableBookmarkBar), 241 prefs::kShowBookmarkBar),
242 TypeAndName(kPolicyEditBookmarksEnabled, 242 TypeAndName(kPolicyEditBookmarksEnabled,
243 prefs::kEditBookmarksEnabled), 243 prefs::kEditBookmarksEnabled),
244 TypeAndName(kPolicyAllowFileSelectionDialogs, 244 TypeAndName(kPolicyAllowFileSelectionDialogs,
245 prefs::kAllowFileSelectionDialogs), 245 prefs::kAllowFileSelectionDialogs),
246 TypeAndName(kPolicyAllowCrossOriginAuthPrompt, 246 TypeAndName(kPolicyAllowCrossOriginAuthPrompt,
247 prefs::kAllowCrossOriginAuthPrompt), 247 prefs::kAllowCrossOriginAuthPrompt),
248 TypeAndName(kPolicyImportBookmarks, 248 TypeAndName(kPolicyImportBookmarks,
249 prefs::kImportBookmarks), 249 prefs::kImportBookmarks),
250 TypeAndName(kPolicyImportHistory, 250 TypeAndName(kPolicyImportHistory,
251 prefs::kImportHistory), 251 prefs::kImportHistory),
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 976
977 provider_.SetInitializationComplete(true); 977 provider_.SetInitializationComplete(true);
978 EXPECT_FALSE(store_->IsInitializationComplete()); 978 EXPECT_FALSE(store_->IsInitializationComplete());
979 979
980 store_->OnUpdatePolicy(); 980 store_->OnUpdatePolicy();
981 Mock::VerifyAndClearExpectations(&observer_); 981 Mock::VerifyAndClearExpectations(&observer_);
982 EXPECT_TRUE(store_->IsInitializationComplete()); 982 EXPECT_TRUE(store_->IsInitializationComplete());
983 } 983 }
984 984
985 } // namespace policy 985 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/prefs/pref_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698