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

Side by Side Diff: chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | 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 "chrome/browser/ui/toolbar/encoding_menu_controller.h" 5 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/prefs/pref_service.h"
11 #include "chrome/app/chrome_command_ids.h" 12 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chrome/test/base/testing_profile.h" 15 #include "chrome/test/base/testing_profile.h"
16 #include "content/public/test/test_browser_thread.h" 16 #include "content/public/test/test_browser_thread.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 using content::BrowserThread; 19 using content::BrowserThread;
20 20
21 class EncodingMenuControllerTest : public testing::Test { 21 class EncodingMenuControllerTest : public testing::Test {
22 public: 22 public:
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 encoding, 93 encoding,
94 valid_encodings[i]); 94 valid_encodings[i]);
95 // Only one item in the encoding menu can be selected at a time. 95 // Only one item in the encoding menu can be selected at a time.
96 ASSERT_FALSE(on && encoding_is_enabled); 96 ASSERT_FALSE(on && encoding_is_enabled);
97 encoding_is_enabled |= on; 97 encoding_is_enabled |= on;
98 } 98 }
99 99
100 // Make sure at least one encoding is enabled. 100 // Make sure at least one encoding is enabled.
101 ASSERT_TRUE(encoding_is_enabled); 101 ASSERT_TRUE(encoding_is_enabled);
102 } 102 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/encoding_menu_controller.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698