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

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed)

Created:
5 years, 4 months ago by Abhishek
Modified:
5 years, 3 months ago
CC:
chromium-reviews, dbeam+watch-options_chromium.org, extensions-reviews_chromium.org, cbentzel+watch_chromium.org, michaelpg+watch-options_chromium.org, droger+watchlist_chromium.org, blundell+watchlist_chromium.org, sdefresne+watchlist_chromium.org, chromium-apps-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Componentize proxy code from chrome/browser/net . Moved preferences from pref_names to proxy_prefs . Using base::ThreadChecker and base::SingleThreadedTaskRunner to remove BrowserThread dependency. . Removed unused notification inclusions. TBR=thakis BUG=516714 Committed: https://crrev.com/71c612855d763ffbb195dd7b927dfeb91eee0326 Cr-Commit-Position: refs/heads/master@{#346369}

Patch Set 1 #

Total comments: 14

Patch Set 2 : self review and updated as commented #

Patch Set 3 : updated gn build #

Total comments: 16

Patch Set 4 : updated gypi and comments #

Total comments: 2

Patch Set 5 : updated more unittest #

Patch Set 6 : updated build errors #

Total comments: 2

Patch Set 7 : updated chromeos build errors #

Patch Set 8 : updated dependencies #

Patch Set 9 : updated gn #

Patch Set 10 : updated PROXY_CONFIG_EXPORT #

Total comments: 3

Patch Set 11 : added thread_checker_.DetachFromThread #

Total comments: 6

Patch Set 12 : changed ProxyPrefs -> proxy_config #

Total comments: 1

Patch Set 13 : using ::proxy_config for chromeos #

Patch Set 14 : updating for win p/f #

Unified diffs Side-by-side diffs Delta from patch set Stats (+300 lines, -856 lines) Patch
M chrome/browser/BUILD.gn View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/chromeos/BUILD.gn View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/chromeos/proxy_config_service_impl.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chromeos/proxy_config_service_impl.cc View 1 2 3 4 5 6 7 8 9 2 chunks +6 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/proxy_config_service_impl_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 6 chunks +9 lines, -6 lines 0 comments Download
M chrome/browser/chromeos/ui_proxy_config_service.cc View 1 2 3 4 5 6 7 8 9 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/extensions/api/preference/preference_api.cc View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +5 lines, -2 lines 0 comments Download
M chrome/browser/extensions/api/proxy/proxy_apitest.cc View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +5 lines, -4 lines 0 comments Download
M chrome/browser/extensions/api/settings_private/prefs_util.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +2 lines, -1 line 0 comments Download
M chrome/browser/extensions/extension_message_bubble_controller_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +2 lines, -3 lines 0 comments Download
M chrome/browser/extensions/settings_api_helpers.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +3 lines, -1 line 0 comments Download
M chrome/browser/io_thread.cc View 2 chunks +1 line, -1 line 0 comments Download
D chrome/browser/net/pref_proxy_config_tracker.h View 1 chunk +0 lines, -43 lines 0 comments Download
D chrome/browser/net/pref_proxy_config_tracker.cc View 1 chunk +0 lines, -11 lines 0 comments Download
D chrome/browser/net/pref_proxy_config_tracker_impl.h View 1 chunk +0 lines, -165 lines 0 comments Download
D chrome/browser/net/pref_proxy_config_tracker_impl.cc View 1 chunk +0 lines, -434 lines 0 comments Download
M chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 14 chunks +20 lines, -27 lines 0 comments Download
M chrome/browser/net/proxy_policy_handler.cc View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +6 lines, -6 lines 0 comments Download
M chrome/browser/net/proxy_policy_handler_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 5 chunks +5 lines, -6 lines 0 comments Download
M chrome/browser/net/proxy_service_factory.cc View 3 chunks +7 lines, -3 lines 0 comments Download
M chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc View 1 2 3 4 5 6 7 8 9 10 11 6 chunks +7 lines, -7 lines 0 comments Download
M chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 15 chunks +29 lines, -19 lines 0 comments Download
M chrome/browser/prefs/browser_prefs.cc View 2 chunks +1 line, -1 line 0 comments Download
M chrome/browser/prefs/command_line_pref_store.cc View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +5 lines, -4 lines 0 comments Download
M chrome/browser/prefs/command_line_pref_store_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +3 lines, -2 lines 0 comments Download
M chrome/browser/prefs/proxy_policy_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 7 chunks +13 lines, -10 lines 0 comments Download
M chrome/browser/profiles/off_the_record_profile_impl.cc View 1 2 3 4 5 6 7 8 9 10 2 chunks +1 line, -2 lines 0 comments Download
M chrome/browser/profiles/profile_impl.cc View 2 chunks +1 line, -1 line 0 comments Download
M chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/ui/prefs/prefs_tab_helper.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +2 lines, -1 line 0 comments Download
M chrome/browser/ui/webui/options/browser_options_handler.cc View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +3 lines, -2 lines 0 comments Download
M chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc View 1 2 3 4 5 6 7 8 9 10 11 4 chunks +7 lines, -5 lines 0 comments Download
M chrome/browser/ui/webui/options/core_options_handler.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +2 lines, -1 line 0 comments Download
M chrome/chrome_browser.gypi View 1 2 3 4 5 2 chunks +2 lines, -5 lines 0 comments Download
M chrome/chrome_browser_chromeos.gypi View 1 2 3 4 5 1 chunk +1 line, -0 lines 0 comments Download
M chrome/common/pref_names.h View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/common/pref_names.cc View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/test/base/testing_profile.cc View 2 chunks +1 line, -1 line 0 comments Download
M components/proxy_config.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +11 lines, -0 lines 0 comments Download
M components/proxy_config/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +11 lines, -1 line 0 comments Download
M components/proxy_config/DEPS View 1 chunk +1 line, -0 lines 0 comments Download
A + components/proxy_config/pref_proxy_config_tracker.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 3 chunks +5 lines, -4 lines 0 comments Download
A + components/proxy_config/pref_proxy_config_tracker.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/proxy_config/pref_proxy_config_tracker_impl.h View 1 2 3 4 5 6 7 8 9 5 chunks +27 lines, -14 lines 0 comments Download
A + components/proxy_config/pref_proxy_config_tracker_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 13 chunks +52 lines, -53 lines 0 comments Download
A components/proxy_config/proxy_config_pref_names.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +19 lines, -0 lines 0 comments Download
A components/proxy_config/proxy_config_pref_names.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +15 lines, -0 lines 0 comments Download
M ios/chrome/ios_chrome.gyp View 1 2 3 4 5 6 7 8 9 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 77 (21 generated)
Abhishek
PTAL!
5 years, 4 months ago (2015-08-17 13:00:42 UTC) #2
droger
Mostly LG. Minor comments below. https://codereview.chromium.org/1296663003/diff/1/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc File chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc (right): https://codereview.chromium.org/1296663003/diff/1/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc#newcode119 chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc:119: content::TestBrowserThread io_thread_; Can we ...
5 years, 4 months ago (2015-08-17 13:51:36 UTC) #3
Abhishek
I've updated it as per the comments. PTAL#3! https://codereview.chromium.org/1296663003/diff/1/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc File chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc (right): https://codereview.chromium.org/1296663003/diff/1/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc#newcode119 chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc:119: content::TestBrowserThread ...
5 years, 4 months ago (2015-08-19 08:30:49 UTC) #4
droger
Very good. Still holding on the LG because of very minor issues.. +atwilson as OWNER ...
5 years, 4 months ago (2015-08-19 09:18:46 UTC) #6
droger
Launching a tryjob for you.
5 years, 4 months ago (2015-08-19 09:19:18 UTC) #8
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1296663003/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1296663003/40001
5 years, 4 months ago (2015-08-19 09:19:19 UTC) #9
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: cast_shell_linux on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/cast_shell_linux/builds/43760) chromium_presubmit on ...
5 years, 4 months ago (2015-08-19 09:22:29 UTC) #11
droger
https://codereview.chromium.org/1296663003/diff/40001/components/proxy_config.gypi File components/proxy_config.gypi (right): https://codereview.chromium.org/1296663003/diff/40001/components/proxy_config.gypi#newcode13 components/proxy_config.gypi:13: '../components.gyp:pref_registry', This should be simply: 'pref_registry',
5 years, 4 months ago (2015-08-19 09:30:53 UTC) #12
Abhishek
All comments are incorporated. PTAL #4! https://codereview.chromium.org/1296663003/diff/40001/components/proxy_config.gypi File components/proxy_config.gypi (right): https://codereview.chromium.org/1296663003/diff/40001/components/proxy_config.gypi#newcode13 components/proxy_config.gypi:13: '../components.gyp:pref_registry', On 2015/08/19 ...
5 years, 4 months ago (2015-08-19 10:10:29 UTC) #13
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1296663003/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1296663003/60001
5 years, 4 months ago (2015-08-19 10:10:51 UTC) #15
commit-bot: I haz the power
Dry run: No L-G-T-M from a valid reviewer yet. Only full committers are accepted. Even ...
5 years, 4 months ago (2015-08-19 10:10:53 UTC) #17
droger
lgtm https://codereview.chromium.org/1296663003/diff/60001/components/proxy_config.gypi File components/proxy_config.gypi (right): https://codereview.chromium.org/1296663003/diff/60001/components/proxy_config.gypi#newcode14 components/proxy_config.gypi:14: 'components.gyp:pref_registry', Drop the components.gyp, just 'pref_registry',
5 years, 4 months ago (2015-08-19 10:42:29 UTC) #19
Abhishek
Thanks for your review! I've updated it. I'm trying to solve buldbot failure issues. https://codereview.chromium.org/1296663003/diff/60001/components/proxy_config.gypi ...
5 years, 4 months ago (2015-08-19 13:31:41 UTC) #20
Andrew T Wilson (Slow)
I don't think I'm an OWNER of any proxy code - specifically which directories do ...
5 years, 4 months ago (2015-08-19 15:03:43 UTC) #21
droger
On 2015/08/19 15:03:43, Andrew T Wilson wrote: > I don't think I'm an OWNER of ...
5 years, 4 months ago (2015-08-19 15:15:24 UTC) #23
stevenjb
I'll take a look, but pneubeck@ should probably look at this also, he's more familiar ...
5 years, 4 months ago (2015-08-19 15:38:29 UTC) #25
stevenjb
Actually, this is pretty mechanical, pnebueck@ - FYI. LGTM https://codereview.chromium.org/1296663003/diff/100001/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc File chrome/browser/extensions/extension_message_bubble_controller_unittest.cc (right): https://codereview.chromium.org/1296663003/diff/100001/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc#newcode19 chrome/browser/extensions/extension_message_bubble_controller_unittest.cc:19: ...
5 years, 4 months ago (2015-08-19 15:44:46 UTC) #26
droger
+mmenke for chrome/browser/net
5 years, 4 months ago (2015-08-19 15:55:58 UTC) #28
mmenke
[+eroman] Deferring to eroman, who knows the proxy stuff better than I do. Not a ...
5 years, 4 months ago (2015-08-19 16:03:12 UTC) #30
droger
On 2015/08/19 16:03:12, mmenke wrote: > [+eroman] Deferring to eroman, who knows the proxy stuff ...
5 years, 4 months ago (2015-08-19 16:29:23 UTC) #31
droger
On 2015/08/19 16:29:23, droger wrote: > On 2015/08/19 16:03:12, mmenke wrote: > > [+eroman] Deferring ...
5 years, 4 months ago (2015-08-19 16:39:33 UTC) #32
blundell
On 2015/08/19 16:03:12, mmenke wrote: > [+eroman] Deferring to eroman, who knows the proxy stuff ...
5 years, 4 months ago (2015-08-20 08:29:10 UTC) #33
mmenke
On 2015/08/20 08:29:10, blundell wrote: > On 2015/08/19 16:03:12, mmenke wrote: > > [+eroman] Deferring ...
5 years, 4 months ago (2015-08-20 11:27:52 UTC) #34
blundell
On 2015/08/20 11:27:52, mmenke wrote: > On 2015/08/20 08:29:10, blundell wrote: > > On 2015/08/19 ...
5 years, 4 months ago (2015-08-20 13:15:01 UTC) #35
Abhishek
I've updated as commented. I'm checking other bots errors. But some bots error are not ...
5 years, 4 months ago (2015-08-20 14:14:51 UTC) #36
droger
On 2015/08/20 14:14:51, Abhishek wrote: > I've updated as commented. > > I'm checking other ...
5 years, 4 months ago (2015-08-20 14:25:35 UTC) #37
droger
On 2015/08/20 14:25:35, droger wrote: > Missing dependency on //url in components/proxy_config/BUILD.gn And components/proxy_config.gypi too.
5 years, 4 months ago (2015-08-20 14:26:24 UTC) #38
Abhishek
On 2015/08/20 14:26:24, droger wrote: > On 2015/08/20 14:25:35, droger wrote: > > Missing dependency ...
5 years, 4 months ago (2015-08-20 14:37:58 UTC) #39
mmenke
On 2015/08/20 13:15:01, blundell wrote: > On 2015/08/20 11:27:52, mmenke wrote: > > On 2015/08/20 ...
5 years, 4 months ago (2015-08-20 15:29:48 UTC) #40
blundell
On 2015/08/20 15:29:48, mmenke wrote: > On 2015/08/20 13:15:01, blundell wrote: > > On 2015/08/20 ...
5 years, 4 months ago (2015-08-25 08:41:43 UTC) #41
blundell
On 2015/08/25 08:41:43, blundell wrote: > On 2015/08/20 15:29:48, mmenke wrote: > > On 2015/08/20 ...
5 years, 4 months ago (2015-08-25 08:43:04 UTC) #42
droger
> What is the status of this CL? Is the next step that there are ...
5 years, 4 months ago (2015-08-25 08:49:06 UTC) #43
Abhishek
On 2015/08/25 08:49:06, droger wrote: > > What is the status of this CL? Is ...
5 years, 4 months ago (2015-08-25 09:01:25 UTC) #44
droger
On 2015/08/25 09:01:25, Abhishek wrote: > On 2015/08/25 08:49:06, droger wrote: > > > What ...
5 years, 4 months ago (2015-08-25 09:21:29 UTC) #45
blundell
On 2015/08/25 09:21:29, droger wrote: > On 2015/08/25 09:01:25, Abhishek wrote: > > On 2015/08/25 ...
5 years, 4 months ago (2015-08-25 09:25:57 UTC) #46
Abhishek
On 2015/08/25 09:25:57, blundell wrote: > On 2015/08/25 09:21:29, droger wrote: > > On 2015/08/25 ...
5 years, 4 months ago (2015-08-25 13:45:16 UTC) #47
Abhishek
PTAL #10! https://codereview.chromium.org/1296663003/diff/180001/components/proxy_config/pref_proxy_config_tracker_impl.cc File components/proxy_config/pref_proxy_config_tracker_impl.cc (right): https://codereview.chromium.org/1296663003/diff/180001/components/proxy_config/pref_proxy_config_tracker_impl.cc#newcode139 components/proxy_config/pref_proxy_config_tracker_impl.cc:139: DCHECK(thread_checker_.CalledOnValidThread()); Tests are crashing at this place. ...
5 years, 3 months ago (2015-08-26 09:48:59 UTC) #48
droger
https://codereview.chromium.org/1296663003/diff/180001/components/proxy_config/pref_proxy_config_tracker_impl.cc File components/proxy_config/pref_proxy_config_tracker_impl.cc (right): https://codereview.chromium.org/1296663003/diff/180001/components/proxy_config/pref_proxy_config_tracker_impl.cc#newcode139 components/proxy_config/pref_proxy_config_tracker_impl.cc:139: DCHECK(thread_checker_.CalledOnValidThread()); On 2015/08/26 09:48:59, Abhishek wrote: > Tests are ...
5 years, 3 months ago (2015-08-26 10:11:22 UTC) #49
Abhishek
PTAL #11! I've updated it as suggested and added it. https://codereview.chromium.org/1296663003/diff/180001/components/proxy_config/pref_proxy_config_tracker_impl.cc File components/proxy_config/pref_proxy_config_tracker_impl.cc (right): https://codereview.chromium.org/1296663003/diff/180001/components/proxy_config/pref_proxy_config_tracker_impl.cc#newcode139 ...
5 years, 3 months ago (2015-08-26 13:44:36 UTC) #50
eroman
The translation looks correct. LGTM as long as someone is going to follow-up for componentizing ...
5 years, 3 months ago (2015-08-27 01:16:33 UTC) #52
Abhishek
I've updated the patch and changed namespace to proxy_config. PTAL #12! https://codereview.chromium.org/1296663003/diff/200001/components/proxy_config/proxy_config_pref_names.h File components/proxy_config/proxy_config_pref_names.h (right): ...
5 years, 3 months ago (2015-08-27 06:38:16 UTC) #53
eroman
patchset 12, LGTM
5 years, 3 months ago (2015-08-27 21:51:48 UTC) #54
Abhishek
+battre c/b/prefs/ +finnur c/b/extensions/ +anthonyvd c/b/profiles/ +phajdan.jr c/test/ +avi c/b/renderer_context_menu/ +cbentzel c/browser/io_thread.cc +jochen c/browser/BUILD.gn PTAL ...
5 years, 3 months ago (2015-08-28 05:51:50 UTC) #56
battre
lgtm
5 years, 3 months ago (2015-08-28 06:40:38 UTC) #57
blundell
On 2015/08/28 05:51:50, Abhishek wrote: > +battre c/b/prefs/ > +finnur c/b/extensions/ > +anthonyvd c/b/profiles/ > ...
5 years, 3 months ago (2015-08-28 08:41:21 UTC) #58
Abhishek
On 2015/08/28 08:41:21, blundell wrote: > On 2015/08/28 05:51:50, Abhishek wrote: > > +battre c/b/prefs/ ...
5 years, 3 months ago (2015-08-28 08:58:04 UTC) #59
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1296663003/220001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1296663003/220001
5 years, 3 months ago (2015-08-28 08:59:03 UTC) #63
blundell
-all the now-superfluous reviewers TBR=thakis for //chrome outside of //chrome/browser/net (When you TBR someone, always ...
5 years, 3 months ago (2015-08-28 09:09:56 UTC) #65
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_gn_chromeos_rel on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_gn_chromeos_rel/builds/75150)
5 years, 3 months ago (2015-08-28 09:13:46 UTC) #67
Abhishek
@eroman / blundell: Could you please confirm namespace change? https://codereview.chromium.org/1296663003/diff/220001/components/proxy_config/proxy_config_pref_names.h File components/proxy_config/proxy_config_pref_names.h (right): https://codereview.chromium.org/1296663003/diff/220001/components/proxy_config/proxy_config_pref_names.h#newcode10 components/proxy_config/proxy_config_pref_names.h:10: ...
5 years, 3 months ago (2015-08-28 11:49:45 UTC) #68
blundell
On 2015/08/28 11:49:45, Abhishek wrote: > @eroman / blundell: > Could you please confirm namespace ...
5 years, 3 months ago (2015-08-28 11:56:35 UTC) #69
Abhishek
On 2015/08/28 11:56:35, blundell wrote: > On 2015/08/28 11:49:45, Abhishek wrote: > > @eroman / ...
5 years, 3 months ago (2015-08-28 12:15:13 UTC) #70
Avi (use Gerrit)
c/b/renderer_context_menu/ lgtm
5 years, 3 months ago (2015-08-28 14:44:02 UTC) #72
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1296663003/260001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1296663003/260001
5 years, 3 months ago (2015-08-31 10:13:41 UTC) #75
commit-bot: I haz the power
Committed patchset #14 (id:260001)
5 years, 3 months ago (2015-08-31 10:48:30 UTC) #76
commit-bot: I haz the power
5 years, 3 months ago (2015-08-31 10:49:05 UTC) #77
Message was sent while issue was closed.
Patchset 14 (id:??) landed as
https://crrev.com/71c612855d763ffbb195dd7b927dfeb91eee0326
Cr-Commit-Position: refs/heads/master@{#346369}

Powered by Google App Engine
This is Rietveld 408576698