Use ChromeBrowserStateManager instead of BrowserListIOS.

Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None

Review-Url: https://codereview.chromium.org/2615003002
Cr-Original-Commit-Position: refs/heads/master@{#443590}
Committed: https://chromium.googlesource.com/chromium/src/+/20f7270f96d194b98f3053a1f5035552cf758c2c
Review-Url: https://codereview.chromium.org/2615003002
Cr-Commit-Position: refs/heads/master@{#443900}
Committed: https://chromium.googlesource.com/chromium/src/+/6165c87433fd1016d114a1159780f6502c4ba798

[sdefresne, 2017-01-05 16:24:24]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-05 16:24:40]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[sdefresne, 2017-01-05 16:27:12]

sdefresne@chromium.org changed reviewers:
+ rohitrao@chromium.org

[sdefresne, 2017-01-05 16:27:13]

Please take a look.

[commit-bot: I haz the power, 2017-01-05 16:27:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-05 16:27:14]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-xco...)

[sdefresne, 2017-01-09 08:15:06]

ping

[sdefresne, 2017-01-09 08:51:33]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-09 08:51:44]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-09 08:53:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-09 08:53:37]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-xcode-...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-xco...)

[sdefresne, 2017-01-09 13:41:44]

Patchset #2 (id:20001) has been deleted

[sdefresne, 2017-01-09 13:43:12]

Patchset #2 (id:40001) has been deleted

[sdefresne, 2017-01-09 13:46:43]

Patchset #1 (id:1) has been deleted

[sdefresne, 2017-01-09 13:49:18]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-09 13:49:32]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-09 14:22:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-09 14:22:53]

Dry run: Try jobs failed on following builders:
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)

[sdefresne, 2017-01-10 14:53:54]

On 2017/01/09 08:15:06, sdefresne wrote:
> ping

After irc discussion, it appears that the assumption there is a 1:1 mapping
between ChromeBrowserState and TabModel is incorrect. Putting this CL on hold
until the mapping is changed to 1:N. Please hold reviewing.

[sdefresne, 2017-01-12 14:19:31]

Description was changed from

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- BrowserListIOS::GetLastActiveWithBrowserState was only used to get
  the TabModel* bound to an ios::ChromeBrowserState, instead call the
  +tabModelForBrowserState method (as there is a 1:1 mapping)

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted, checking the
  associated off-the-record browser state

- BrowserListIOS::IsOffTheRecordSessionActive was re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None
==========

to

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None
==========

[sdefresne, 2017-01-12 14:33:07]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-12 14:33:24]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[sdefresne, 2017-01-12 14:34:47]

Patchset #3 (id:100001) has been deleted

[commit-bot: I haz the power, 2017-01-12 14:36:07]

Dry run: Try jobs failed on following builders:
  android_arm64_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm6...)
  android_cronet on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_cron...)
  android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...)
  cast_shell_android on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...)
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[commit-bot: I haz the power, 2017-01-12 14:38:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-12 14:38:08]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-xcode-...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-xco...)

[sdefresne, 2017-01-12 14:38:39]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-12 14:38:50]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[sdefresne, 2017-01-12 14:38:57]

sdefresne@chromium.org changed reviewers:
+ marq@chromium.org

[sdefresne, 2017-01-12 14:38:58]

This is now ready for review. PTAL.

[commit-bot: I haz the power, 2017-01-12 15:27:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-12 15:27:23]

Dry run: This issue passed the CQ dry run.

[marq (ping after 24h), 2017-01-13 12:29:43]

LGTM

[sdefresne, 2017-01-13 14:38:08]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2017-01-13 14:38:27]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-13 14:42:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-13 14:42:41]

Failed to apply patch for ios/chrome/browser/ui/browser_view_controller.mm:
While running git apply --index -p1;
  error: patch failed: ios/chrome/browser/ui/browser_view_controller.mm:1672
  error: ios/chrome/browser/ui/browser_view_controller.mm: patch does not apply

Patch:       ios/chrome/browser/ui/browser_view_controller.mm
Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm
b/ios/chrome/browser/ui/browser_view_controller.mm
index
96a7e1384d5a4ca4e19d7957b06151b6aeffe29a..9e14f4fdb5f4e6e3ba55879b24ac56d348a9e461
100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -87,7 +87,6 @@
 #import "ios/chrome/browser/ui/background_generator.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h"
 #import "ios/chrome/browser/ui/browser_container_view.h"
-#import "ios/chrome/browser/ui/browser_list_ios.h"
 #import "ios/chrome/browser/ui/browser_view_controller_dependency_factory.h"
 #import "ios/chrome/browser/ui/chrome_web_view_factory.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
@@ -917,7 +916,6 @@ class BrowserBookmarkModelBridge : public
bookmarks::BookmarkModelObserver {
     // TODO(leng): Delay this.
     [[UpgradeCenter sharedInstance] registerClient:self];
     _inNewTabAnimation = NO;
-    BrowserListIOS::AddBrowser(self);
     if (model && browserState)
       [self updateWithTabModel:model browserState:browserState];
     if ([[NSUserDefaults standardUserDefaults]
@@ -943,7 +941,6 @@ class BrowserBookmarkModelBridge : public
bookmarks::BookmarkModelObserver {
   _tabStripController.reset();
   _infoBarContainer.reset();
   _readingListMenuNotifier.reset();
-  BrowserListIOS::RemoveBrowser(self);
   _bookmarkModel->RemoveObserver(_bookmarkModelBridge.get());
   [_model removeObserver:self];
   [[UpgradeCenter sharedInstance] unregisterClient:self];
@@ -1044,6 +1041,14 @@ class BrowserBookmarkModelBridge : public
bookmarks::BookmarkModelObserver {
   return _voiceSearchController && _voiceSearchController->IsPlayingAudio();
 }
 
+- (ios::ChromeBrowserState*)browserState {
+  return _browserState;
+}
+
+- (TabModel*)tabModel {
+  return _model.get();
+}
+
 - (SideSwipeController*)sideSwipeController {
   if (!_sideSwipeController) {
     _sideSwipeController.reset([[SideSwipeController alloc]
@@ -1672,7 +1677,6 @@ class BrowserBookmarkModelBridge : public
bookmarks::BookmarkModelObserver {
   [_contextualSearchMask removeFromSuperview];
   [_paymentRequestManager close];
   _paymentRequestManager.reset();
-  BrowserListIOS::RemoveBrowser(self);
   [_toolbarController browserStateDestroyed];
   [_model browserStateDestroyed];
   // The file remover needs the browser state, so needs to be destroyed now.
@@ -3236,16 +3240,6 @@ class BrowserBookmarkModelBridge : public
bookmarks::BookmarkModelObserver {
   }
 }
 
-#pragma mark - BrowserIOS methods
-
-- (ios::ChromeBrowserState*)browserState {
-  return _browserState;
-}
-
-- (TabModel*)tabModel {
-  return _model.get();
-}
-
 #pragma mark - No-tabs UI methods
 
 // Show the No-Tabs UI (hiding normal tab/web ui).

[sdefresne, 2017-01-13 15:57:45]

The CQ bit was checked by sdefresne@chromium.org

[sdefresne, 2017-01-13 15:57:46]

The patchset sent to the CQ was uploaded after l-g-t-m from marq@chromium.org
Link to the patchset: https://codereview.chromium.org/2615003002/#ps140001
(title: "Rebase.")

[commit-bot: I haz the power, 2017-01-13 15:58:13]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-13 17:16:32]

CQ is committing da patch.

Bot data: {"patchset_id": 140001, "attempt_start_ts": 1484323065969370,
"parent_rev": "1bb13224524862e5d3be4ac68c6377a4e54c9433", "commit_rev":
"20f7270f96d194b98f3053a1f5035552cf758c2c"}

[commit-bot: I haz the power, 2017-01-13 17:17:24]

Description was changed from

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None
==========

to

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None

Review-Url: https://codereview.chromium.org/2615003002
Cr-Commit-Position: refs/heads/master@{#443590}
Committed:
https://chromium.googlesource.com/chromium/src/+/20f7270f96d194b98f3053a1f503...
==========

[commit-bot: I haz the power, 2017-01-13 17:17:25]

Committed patchset #4 (id:140001) as
https://chromium.googlesource.com/chromium/src/+/20f7270f96d194b98f3053a1f503...

[Eugene But (OOO till 7-30), 2017-01-13 23:46:03]

A revert of this CL (patchset #4 id:140001) has been created in
https://codereview.chromium.org/2628273004/ by eugenebut@chromium.org.

The reason for reverting is: Breaks NewTabPagePerfTest.OpenNTP_Gentle

https://goto.google.com/cl-2615003002-breaks-perf-test.

[sdefresne, 2017-01-16 08:12:41]

Description was changed from

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None

Review-Url: https://codereview.chromium.org/2615003002
Cr-Commit-Position: refs/heads/master@{#443590}
Committed:
https://chromium.googlesource.com/chromium/src/+/20f7270f96d194b98f3053a1f503...
==========

to

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None

Review-Url: https://codereview.chromium.org/2615003002
Cr-Commit-Position: refs/heads/master@{#443590}
Committed:
https://chromium.googlesource.com/chromium/src/+/20f7270f96d194b98f3053a1f503...
==========

[sdefresne, 2017-01-16 09:37:28]

I've fixed ios_chrome_perftests. Please take a look at
	ios/chrome/browser/test/perf_test_with_bvc_ios.* for the fix (last patchset).

[marq (ping after 24h), 2017-01-16 11:58:50]

Fix LGTM

[sdefresne, 2017-01-16 13:31:16]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2017-01-16 13:31:25]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-16 15:42:06]

CQ is committing da patch.

Bot data: {"patchset_id": 180001, "attempt_start_ts": 1484573476002990,
"parent_rev": "c6f827f406ef2b71339fa34bc82a632519a84e5b", "commit_rev":
"6165c87433fd1016d114a1159780f6502c4ba798"}

[commit-bot: I haz the power, 2017-01-16 15:42:37]

Description was changed from

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None

Review-Url: https://codereview.chromium.org/2615003002
Cr-Commit-Position: refs/heads/master@{#443590}
Committed:
https://chromium.googlesource.com/chromium/src/+/20f7270f96d194b98f3053a1f503...
==========

to

==========
Use ChromeBrowserStateManager instead of BrowserListIOS.

The BrowserListIOS was there as a parallel to BrowserList while the
code was forked and is now only of historical interest as all of its
methods can be implemented using ChromeBrowserStateManager.

The following rules were used when converting from BrowserListIOS to
ChromeBrowserStateManager:

- re-implement BrowserListIOS::GetLastActiveWithBrowserState in term
  of iterating over all ios::ChromeBrowserState registered with the
  ChromeBrowserStateManager, and then over the TabModels associated
  with those ios::ChromeBrowserState

- iteration over BrowserListIOS::begin()/BrowserListIOS::end() can be
  replaced by iterating over the list from GetLoadedBrowserState() and
  if off-the-record ios::ChromeBrowserState are wanted it, and for each
  of them iterating over the TabModels associated

- BrowserListIOS::IsOffTheRecordSessionActive is re-implemented as
  a free function implemented on top of ChromeBrowserStateManager using
  the same rules.

BUG=None

Review-Url: https://codereview.chromium.org/2615003002
Cr-Original-Commit-Position: refs/heads/master@{#443590}
Committed:
https://chromium.googlesource.com/chromium/src/+/20f7270f96d194b98f3053a1f503...
Review-Url: https://codereview.chromium.org/2615003002
Cr-Commit-Position: refs/heads/master@{#443900}
Committed:
https://chromium.googlesource.com/chromium/src/+/6165c87433fd1016d114a1159780...
==========

[commit-bot: I haz the power, 2017-01-16 15:42:39]

Committed patchset #6 (id:180001) as
https://chromium.googlesource.com/chromium/src/+/6165c87433fd1016d114a1159780...