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

Unified Diff: chrome/browser/ui/cocoa/browser_test_helper.h

Issue 7648037: [Mac] Flip the flag for multi-profiles to on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Un-needed includes Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_test_helper.h
diff --git a/chrome/browser/ui/cocoa/browser_test_helper.h b/chrome/browser/ui/cocoa/browser_test_helper.h
index 4b196625b492100c1dd6b24268cff7e822be10e4..d2461529e01a70f1d65676f8552cfce3b240bb2f 100644
--- a/chrome/browser/ui/cocoa/browser_test_helper.h
+++ b/chrome/browser/ui/cocoa/browser_test_helper.h
@@ -9,6 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/testing_profile_manager.h"
#include "content/browser/browser_thread.h"
// Base class which contains a valid Browser*. Lots of boilerplate to
@@ -32,6 +33,9 @@ class BrowserTestHelper {
virtual TestingProfile* profile() const;
Browser* browser() const { return browser_.get(); }
+ TestingBrowserProcess* browser_process() {
+ return browser_process_.get();
+ }
// Creates the browser window. To close this window call |CloseBrowserWindow|.
// Do NOT call close directly on the window.
@@ -42,8 +46,15 @@ class BrowserTestHelper {
void CloseBrowserWindow();
private:
+ // Code that will relies on g_browser_process->profile_manager() needs special
+ // setup. This performs that setup now that multiprofiles is enabled.
+ void SetUpProfileManager();
+
ScopedTestingBrowserProcess browser_process_;
+ TestingProfileManager* profile_manager_;
+ scoped_ptr<AvatarMenuModel::Item> profile_info_;
+
scoped_ptr<TestingProfile> profile_;
scoped_ptr<Browser> browser_;
MessageLoopForUI message_loop_;

Powered by Google App Engine
This is Rietveld 408576698