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

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

Issue 504453002: Use 'You' as profile name for a single signed profile whose gaia name is not available yet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix broken tests 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
« no previous file with comments | « chrome/browser/profiles/profiles_state.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 8 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 28 matching lines...) Expand all
39 39
40 // Make sure any pending tasks run before we destroy other threads. 40 // Make sure any pending tasks run before we destroy other threads.
41 base::RunLoop().RunUntilIdle(); 41 base::RunLoop().RunUntilIdle();
42 } 42 }
43 43
44 void CocoaProfileTest::SetUp() { 44 void CocoaProfileTest::SetUp() {
45 CocoaTest::SetUp(); 45 CocoaTest::SetUp();
46 46
47 ASSERT_TRUE(profile_manager_.SetUp()); 47 ASSERT_TRUE(profile_manager_.SetUp());
48 48
49 profile_ = profile_manager_.CreateTestingProfile("default"); 49 profile_ = profile_manager_.CreateTestingProfile("Person 1");
50 ASSERT_TRUE(profile_); 50 ASSERT_TRUE(profile_);
51 51
52 // TODO(shess): These are needed in case someone creates a browser 52 // TODO(shess): These are needed in case someone creates a browser
53 // window off of browser_. pkasting indicates that other 53 // window off of browser_. pkasting indicates that other
54 // platforms use a stub |BrowserWindow| and thus don't need to do 54 // platforms use a stub |BrowserWindow| and thus don't need to do
55 // this. 55 // this.
56 // http://crbug.com/39725 56 // http://crbug.com/39725
57 TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse( 57 TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
58 profile_, &TemplateURLServiceFactory::BuildInstanceFor); 58 profile_, &TemplateURLServiceFactory::BuildInstanceFor);
59 AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse( 59 AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
(...skipping 20 matching lines...) Expand all
80 browser_->tab_strip_model()->CloseAllTabs(); 80 browser_->tab_strip_model()->CloseAllTabs();
81 chrome::CloseWindow(browser_.get()); 81 chrome::CloseWindow(browser_.get());
82 // |browser_| will be deleted by its BrowserWindowController. 82 // |browser_| will be deleted by its BrowserWindowController.
83 ignore_result(browser_.release()); 83 ignore_result(browser_.release());
84 } 84 }
85 85
86 Browser* CocoaProfileTest::CreateBrowser() { 86 Browser* CocoaProfileTest::CreateBrowser() {
87 return new Browser(Browser::CreateParams(profile(), 87 return new Browser(Browser::CreateParams(profile(),
88 chrome::GetActiveDesktop())); 88 chrome::GetActiveDesktop()));
89 } 89 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profiles_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698