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

Side by Side Diff: chrome/browser/ui/cocoa/cocoa_profile_test.mm

Issue 1307093004: Remove references to IsNewAvatarMenu since the flag was removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert FRAME_AVATAR_BUTTON changes. Created 5 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/cocoa/cocoa_profile_test.h" 5 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 9 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/search_engines/template_url_service_factory.h" 12 #include "chrome/browser/search_engines/template_url_service_factory.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_commands.h" 14 #include "chrome/browser/ui/browser_commands.h"
15 #include "chrome/browser/ui/browser_tabstrip.h" 15 #include "chrome/browser/ui/browser_tabstrip.h"
16 #include "chrome/browser/ui/host_desktop.h" 16 #include "chrome/browser/ui/host_desktop.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/test/base/testing_browser_process.h" 18 #include "chrome/test/base/testing_browser_process.h"
19 #include "chrome/test/base/testing_profile.h" 19 #include "chrome/test/base/testing_profile.h"
20 #include "components/bookmarks/test/bookmark_test_helpers.h" 20 #include "components/bookmarks/test/bookmark_test_helpers.h"
21 #include "components/syncable_prefs/pref_service_syncable.h" 21 #include "components/syncable_prefs/pref_service_syncable.h"
22 #include "content/public/test/test_browser_thread_bundle.h" 22 #include "content/public/test/test_browser_thread_bundle.h"
23 23
24 CocoaProfileTest::CocoaProfileTest() 24 CocoaProfileTest::CocoaProfileTest()
25 : profile_manager_(TestingBrowserProcess::GetGlobal()), 25 : profile_manager_(TestingBrowserProcess::GetGlobal()),
26 profile_(NULL), 26 profile_(NULL),
27 incognito_(false),
27 thread_bundle_(new content::TestBrowserThreadBundle) { 28 thread_bundle_(new content::TestBrowserThreadBundle) {
28 } 29 }
29 30
31 CocoaProfileTest::CocoaProfileTest(bool incognito)
32 : profile_manager_(TestingBrowserProcess::GetGlobal()),
33 profile_(NULL),
34 incognito_(incognito),
35 thread_bundle_(new content::TestBrowserThreadBundle) {
36 }
37
30 CocoaProfileTest::~CocoaProfileTest() { 38 CocoaProfileTest::~CocoaProfileTest() {
31 // Delete the testing profile on the UI thread. But first release the 39 // Delete the testing profile on the UI thread. But first release the
32 // browser, since it may trigger accesses to the profile upon destruction. 40 // browser, since it may trigger accesses to the profile upon destruction.
33 browser_.reset(); 41 browser_.reset();
34 42
35 base::RunLoop().RunUntilIdle(); 43 base::RunLoop().RunUntilIdle();
36 44
37 // Some services created on the TestingProfile require deletion on the UI 45 // Some services created on the TestingProfile require deletion on the UI
38 // thread. If the scoper in TestingBrowserProcess, owned by ChromeTestSuite, 46 // thread. If the scoper in TestingBrowserProcess, owned by ChromeTestSuite,
39 // were to delete the ProfileManager, the UI thread would at that point no 47 // were to delete the ProfileManager, the UI thread would at that point no
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void CocoaProfileTest::CloseBrowserWindow() { 98 void CocoaProfileTest::CloseBrowserWindow() {
91 // Check to make sure a window was actually created. 99 // Check to make sure a window was actually created.
92 DCHECK(browser_->window()); 100 DCHECK(browser_->window());
93 browser_->tab_strip_model()->CloseAllTabs(); 101 browser_->tab_strip_model()->CloseAllTabs();
94 chrome::CloseWindow(browser_.get()); 102 chrome::CloseWindow(browser_.get());
95 // |browser_| will be deleted by its BrowserWindowController. 103 // |browser_| will be deleted by its BrowserWindowController.
96 ignore_result(browser_.release()); 104 ignore_result(browser_.release());
97 } 105 }
98 106
99 Browser* CocoaProfileTest::CreateBrowser() { 107 Browser* CocoaProfileTest::CreateBrowser() {
100 return new Browser(Browser::CreateParams(profile(), 108 Profile* browser_profile = incognito_ ? profile()->GetOffTheRecordProfile() :
109 profile();
110 return new Browser(Browser::CreateParams(browser_profile,
101 chrome::GetActiveDesktop())); 111 chrome::GetActiveDesktop()));
102 } 112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698