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

Side by Side Diff: chrome/browser/profiles/profile_list_desktop_unittest.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 "chrome/browser/profiles/profile_list_desktop.h" 5 #include "chrome/browser/profiles/profile_list_desktop.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/prefs/pref_service_syncable.h" 14 #include "chrome/browser/prefs/pref_service_syncable.h"
15 #include "chrome/browser/profiles/avatar_menu_observer.h" 15 #include "chrome/browser/profiles/avatar_menu_observer.h"
16 #include "chrome/browser/profiles/profile_info_cache.h" 16 #include "chrome/browser/profiles/profile_info_cache.h"
17 #include "chrome/browser/profiles/profiles_state.h" 17 #include "chrome/browser/profiles/profiles_state.h"
18 #include "chrome/grit/generated_resources.h"
18 #include "chrome/test/base/testing_browser_process.h" 19 #include "chrome/test/base/testing_browser_process.h"
19 #include "chrome/test/base/testing_profile_manager.h" 20 #include "chrome/test/base/testing_profile_manager.h"
20 #include "components/signin/core/common/profile_management_switches.h" 21 #include "components/signin/core/common/profile_management_switches.h"
21 #include "content/public/test/test_browser_thread_bundle.h" 22 #include "content/public/test/test_browser_thread_bundle.h"
22 #include "grit/generated_resources.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 25
26 using base::ASCIIToUTF16; 26 using base::ASCIIToUTF16;
27 27
28 namespace { 28 namespace {
29 29
30 class MockObserver : public AvatarMenuObserver { 30 class MockObserver : public AvatarMenuObserver {
31 public: 31 public:
32 MockObserver() : count_(0) {} 32 MockObserver() : count_(0) {}
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 base::string16 supervised_user_label = 355 base::string16 supervised_user_label =
356 l10n_util::GetStringUTF16(IDS_SUPERVISED_USER_AVATAR_LABEL); 356 l10n_util::GetStringUTF16(IDS_SUPERVISED_USER_AVATAR_LABEL);
357 const AvatarMenu::Item& item1 = model->GetItemAt(0); 357 const AvatarMenu::Item& item1 = model->GetItemAt(0);
358 EXPECT_NE(item1.sync_state, supervised_user_label); 358 EXPECT_NE(item1.sync_state, supervised_user_label);
359 359
360 const AvatarMenu::Item& item2 = model->GetItemAt(1); 360 const AvatarMenu::Item& item2 = model->GetItemAt(1);
361 EXPECT_EQ(item2.sync_state, supervised_user_label); 361 EXPECT_EQ(item2.sync_state, supervised_user_label);
362 } 362 }
363 363
364 } // namespace 364 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698