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

Side by Side Diff: chrome/test/base/browser_with_test_window_test.h

Issue 9420036: Also delay regular profile destruction... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 5 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 void set_window(TestBrowserWindow* window) { 72 void set_window(TestBrowserWindow* window) {
73 window_.reset(window); 73 window_.reset(window);
74 } 74 }
75 75
76 Browser* browser() const { return browser_.get(); } 76 Browser* browser() const { return browser_.get(); }
77 void set_browser(Browser* browser) { 77 void set_browser(Browser* browser) {
78 browser_.reset(browser); 78 browser_.reset(browser);
79 } 79 }
80 80
81 TestingProfile* profile() const { return profile_.get(); } 81 TestingProfile* profile() const { return profile_.get(); }
82 void set_profile(TestingProfile* profile) { 82 void set_profile(TestingProfile* profile);
83 profile_.reset(profile);
84 }
85 83
86 MessageLoop* message_loop() { return &ui_loop_; } 84 MessageLoop* message_loop() { return &ui_loop_; }
87 85
88 // Adds a tab to |browser| with the given URL and commits the load. 86 // Adds a tab to |browser| with the given URL and commits the load.
89 // This is a convenience function. The new tab will be added at index 0. 87 // This is a convenience function. The new tab will be added at index 0.
90 void AddTab(Browser* browser, const GURL& url); 88 void AddTab(Browser* browser, const GURL& url);
91 89
92 // Commits the pending load on the given controller. It will keep the 90 // Commits the pending load on the given controller. It will keep the
93 // URL of the pending load. If there is no pending load, this does nothing. 91 // URL of the pending load. If there is no pending load, this does nothing.
94 void CommitPendingLoad(content::NavigationController* controller); 92 void CommitPendingLoad(content::NavigationController* controller);
(...skipping 30 matching lines...) Expand all
125 TestRenderViewHostFactory rvh_factory_; 123 TestRenderViewHostFactory rvh_factory_;
126 124
127 #if defined(USE_AURA) 125 #if defined(USE_AURA)
128 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 126 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
129 #endif 127 #endif
130 128
131 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); 129 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
132 }; 130 };
133 131
134 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 132 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698