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

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

Issue 7621031: Revert 97049 - Trying to see if it fixes sync_integration_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- chrome/browser/ui/cocoa/browser_test_helper.h (revision 97074)
+++ chrome/browser/ui/cocoa/browser_test_helper.h (working copy)
@@ -9,7 +9,6 @@
#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
@@ -33,9 +32,6 @@
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.
@@ -46,15 +42,8 @@
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_;
« no previous file with comments | « chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/browser_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698