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

Side by Side Diff: chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc

Issue 454583002: Cleanup: Remove unneeded #includes for grit/, ui/base/l10n/l10n_util.h and ui/base/resource/resourc… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Cros some more 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/profiles/profiles_state.h" 10 #include "chrome/browser/profiles/profiles_state.h"
11 #include "chrome/browser/ui/browser_dialogs.h" 11 #include "chrome/browser/ui/browser_dialogs.h"
12 #include "chrome/browser/ui/browser_list.h" 12 #include "chrome/browser/ui/browser_list.h"
13 #include "chrome/browser/ui/views/frame/browser_view.h" 13 #include "chrome/browser/ui/views/frame/browser_view.h"
14 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" 14 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
15 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" 15 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
16 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" 16 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
17 #include "chrome/browser/ui/views/profiles/user_manager_view.h" 17 #include "chrome/browser/ui/views/profiles/user_manager_view.h"
18 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/test/base/in_process_browser_test.h" 20 #include "chrome/test/base/in_process_browser_test.h"
21 #include "chrome/test/base/test_switches.h" 21 #include "chrome/test/base/test_switches.h"
22 #include "chrome/test/base/testing_browser_process.h" 22 #include "chrome/test/base/testing_browser_process.h"
23 #include "components/signin/core/common/profile_management_switches.h" 23 #include "components/signin/core/common/profile_management_switches.h"
24 #include "content/public/test/test_utils.h" 24 #include "content/public/test/test_utils.h"
25 #include "grit/generated_resources.h"
26 #include "ui/views/controls/button/label_button.h" 25 #include "ui/views/controls/button/label_button.h"
27 26
28 class NewAvatarMenuButtonTest : public InProcessBrowserTest { 27 class NewAvatarMenuButtonTest : public InProcessBrowserTest {
29 public: 28 public:
30 NewAvatarMenuButtonTest(); 29 NewAvatarMenuButtonTest();
31 virtual ~NewAvatarMenuButtonTest(); 30 virtual ~NewAvatarMenuButtonTest();
32 31
33 protected: 32 protected:
34 virtual void SetUp() OVERRIDE; 33 virtual void SetUp() OVERRIDE;
35 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; 34 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 window_close_observer.Wait(); // Rely on test timeout for failure indication. 131 window_close_observer.Wait(); // Rely on test timeout for failure indication.
133 EXPECT_TRUE(browser_list->empty()); 132 EXPECT_TRUE(browser_list->empty());
134 133
135 // If the User Manager hasn't shown yet, wait for it to show up. 134 // If the User Manager hasn't shown yet, wait for it to show up.
136 if (!UserManagerView::IsShowing()) 135 if (!UserManagerView::IsShowing())
137 base::MessageLoop::current()->RunUntilIdle(); 136 base::MessageLoop::current()->RunUntilIdle();
138 137
139 // We need to hide the User Manager or else the process can't die. 138 // We need to hide the User Manager or else the process can't die.
140 chrome::HideUserManager(); 139 chrome::HideUserManager();
141 } 140 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698