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

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

Issue 649413002: Roll src/third_party/icu 8ac906f:d8b2a9d (svn 292317:292476) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: space/indent fix Created 6 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
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/toolbar/wrench_menu_model.h" 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/prefs/browser_prefs.h" 8 #include "chrome/browser/prefs/browser_prefs.h"
9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 EXPECT_EQ(1, error1->execute_count()); 192 EXPECT_EQ(1, error1->execute_count());
193 } 193 }
194 194
195 class EncodingMenuModelTest : public BrowserWithTestWindowTest, 195 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
196 public MenuModelTest { 196 public MenuModelTest {
197 }; 197 };
198 198
199 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) { 199 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
200 EncodingMenuModel model(browser()); 200 EncodingMenuModel model(browser());
201 ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents()); 201 ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents());
202 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591)); 202 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_WINDOWS1252));
203 } 203 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698