summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 01:29:10 +0000
committermtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 01:29:10 +0000
commit2840b01c9ebd871f6d4d73a211b8986c301c0606 (patch)
tree94106f3c9c6333e71b2b1f3ea8e7f3bf8b178fd5
parentc4ddb5c45cc536576bd482ed0c260c19ea0251c5 (diff)
downloadchromium_src-2840b01c9ebd871f6d4d73a211b8986c301c0606.zip
chromium_src-2840b01c9ebd871f6d4d73a211b8986c301c0606.tar.gz
chromium_src-2840b01c9ebd871f6d4d73a211b8986c301c0606.tar.bz2
Grouped owned and not owned members in testing_browser_process.h.
This patch groups not owned members together, so it is now obvious which members should be deleted outside of the class. BUG=160670 Review URL: https://chromiumcodereview.appspot.com/11377121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168346 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/base/testing_browser_process.cc2
-rw-r--r--chrome/test/base/testing_browser_process.h10
2 files changed, 5 insertions, 7 deletions
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 2739d70..9122888 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -33,10 +33,10 @@ TestingBrowserProcess::TestingBrowserProcess()
: notification_service_(content::NotificationService::Create()),
module_ref_count_(0),
app_locale_("en"),
- local_state_(NULL),
#if !defined(OS_IOS)
render_widget_snapshot_taker_(new RenderWidgetSnapshotTaker),
#endif
+ local_state_(NULL),
io_thread_(NULL),
system_request_context_(NULL) {
}
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index b2138d0..a3f6c2e 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -114,8 +114,6 @@ class TestingBrowserProcess : public BrowserProcess {
unsigned int module_ref_count_;
std::string app_locale_;
- // Weak pointer.
- PrefService* local_state_;
// TODO(ios): Add back members as more code is compiled.
#if !defined(OS_IOS)
#if defined(ENABLE_CONFIGURATION_POLICY)
@@ -130,13 +128,13 @@ class TestingBrowserProcess : public BrowserProcess {
print_preview_tab_controller_;
scoped_ptr<prerender::PrerenderTracker> prerender_tracker_;
scoped_ptr<RenderWidgetSnapshotTaker> render_widget_snapshot_taker_;
-#endif // !defined(OS_IOS)
- IOThread* io_thread_;
- // TODO(ios): Add back members as more code is compiled.
-#if !defined(OS_IOS)
scoped_refptr<SafeBrowsingService> sb_service_;
scoped_ptr<BookmarkPromptController> bookmark_prompt_controller_;
#endif // !defined(OS_IOS)
+
+ // The following objects are not owned by TestingBrowserProcess:
+ PrefService* local_state_;
+ IOThread* io_thread_;
net::URLRequestContextGetter* system_request_context_;
DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);