Revert of Fix nullptr exception on ios_internal

Revert of Fix nullptr exception on ios_internal (patchset #1 id:1 of https://codereview.chromium.org/2512653003/ )

Reason for revert:
This CL depends upon r432845 which has also been reverted.

Please re-land this after re-landing r432845.

Original issue's description:
> Fix nullptr exception on ios_internal
>
> BUG=661668
>
> Committed: https://crrev.com/2a006f7420305db8a069bcc747d4bc343e47f702
> Cr-Commit-Position: refs/heads/master@{#432860}

TBR=jif@chromium.org,jif@google.com,olivierrobin@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=661668
Committed: https://crrev.com/d9269c3ec59239e2f572475ec4610178808c6a0b
Cr-Commit-Position: refs/heads/master@{#433021}

[Matt Giuca, 2016-11-18 02:08:40]

The CQ bit was checked by mgiuca@chromium.org

[Matt Giuca, 2016-11-18 02:08:40]

Created Revert of Fix nullptr exception on ios_internal

[commit-bot: I haz the power, 2016-11-18 02:10:01]

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, 2016-11-18 02:10:52]

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

[commit-bot: I haz the power, 2016-11-18 02:10:56]

Failed to apply patch for
ios/chrome/browser/reading_list/reading_list_model_factory.cc:
While running git apply --index -p1;
  error: patch failed:
ios/chrome/browser/reading_list/reading_list_model_factory.cc:21
  error: ios/chrome/browser/reading_list/reading_list_model_factory.cc: patch
does not apply

Patch:       ios/chrome/browser/reading_list/reading_list_model_factory.cc
Index: ios/chrome/browser/reading_list/reading_list_model_factory.cc
diff --git a/ios/chrome/browser/reading_list/reading_list_model_factory.cc
b/ios/chrome/browser/reading_list/reading_list_model_factory.cc
index
393422c2419c77aff7f2f48a37d07944004d0406..24eb53a7cf79c010320e2967ddc202b64dfc1788
100644
--- a/ios/chrome/browser/reading_list/reading_list_model_factory.cc
+++ b/ios/chrome/browser/reading_list/reading_list_model_factory.cc
@@ -21,13 +21,11 @@
 #include "ios/web/public/web_thread.h"
 
 // static
-bool ReadingListModelFactory::IsReadingListEnabled() {
-  return experimental_flags::IsReadingListEnabled();
-}
-
-// static
 ReadingListModel* ReadingListModelFactory::GetForBrowserState(
     ios::ChromeBrowserState* browser_state) {
+  if (!experimental_flags::IsReadingListEnabled()) {
+    return nullptr;
+  }
   return static_cast<ReadingListModelImpl*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -35,6 +33,9 @@
 // static
 ReadingListModel* ReadingListModelFactory::GetForBrowserStateIfExists(
     ios::ChromeBrowserState* browser_state) {
+  if (!experimental_flags::IsReadingListEnabled()) {
+    return nullptr;
+  }
   return static_cast<ReadingListModelImpl*>(
       GetInstance()->GetServiceForBrowserState(browser_state, false));
 }

[smut, 2016-11-18 02:26:49]

smut@google.com changed reviewers:
+ smut@google.com

[smut, 2016-11-18 02:26:50]

Please manually resolve conflicts and land this. Your revert of the previous CL
[1] without this being committed is causing failures on ios-simulator on the CQ
[2].

[1]
https://chromium.googlesource.com/chromium/src/+/49740e42977be69ae7c1af0f01df...
[2]
https://uberchromegw.corp.google.com/i/tryserver.chromium.mac/builders/ios-si...

[Matt Giuca, 2016-11-18 02:37:22]

The CQ bit was checked by mgiuca@chromium.org

[Matt Giuca, 2016-11-18 02:38:10]

Done. I'm not really sure what this CL was doing -- it introduces a new static
method that isn't called from anywhere.

[commit-bot: I haz the power, 2016-11-18 02:38:53]

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, 2016-11-18 02:40:34]

Description was changed from

==========
Revert of Fix nullptr exception on ios_internal (patchset #1 id:1 of
https://codereview.chromium.org/2512653003/ )

Reason for revert:
This CL depends upon r432845 which has also been reverted.

Please re-land this after re-landing r432845.

Original issue's description:
> Fix nullptr exception on ios_internal
> 
> BUG=661668
> 
> Committed: https://crrev.com/2a006f7420305db8a069bcc747d4bc343e47f702
> Cr-Commit-Position: refs/heads/master@{#432860}

TBR=jif@chromium.org,jif@google.com,olivierrobin@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=661668
==========

to

==========
Revert of Fix nullptr exception on ios_internal (patchset #1 id:1 of
https://codereview.chromium.org/2512653003/ )

Reason for revert:
This CL depends upon r432845 which has also been reverted.

Please re-land this after re-landing r432845.

Original issue's description:
> Fix nullptr exception on ios_internal
> 
> BUG=661668
> 
> Committed: https://crrev.com/2a006f7420305db8a069bcc747d4bc343e47f702
> Cr-Commit-Position: refs/heads/master@{#432860}

TBR=jif@chromium.org,jif@google.com,olivierrobin@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=661668
==========

[commit-bot: I haz the power, 2016-11-18 02:40:35]

Committed patchset #2 (id:70001)

[commit-bot: I haz the power, 2016-11-18 02:42:12]

Description was changed from

==========
Revert of Fix nullptr exception on ios_internal (patchset #1 id:1 of
https://codereview.chromium.org/2512653003/ )

Reason for revert:
This CL depends upon r432845 which has also been reverted.

Please re-land this after re-landing r432845.

Original issue's description:
> Fix nullptr exception on ios_internal
> 
> BUG=661668
> 
> Committed: https://crrev.com/2a006f7420305db8a069bcc747d4bc343e47f702
> Cr-Commit-Position: refs/heads/master@{#432860}

TBR=jif@chromium.org,jif@google.com,olivierrobin@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=661668
==========

to

==========
Revert of Fix nullptr exception on ios_internal (patchset #1 id:1 of
https://codereview.chromium.org/2512653003/ )

Reason for revert:
This CL depends upon r432845 which has also been reverted.

Please re-land this after re-landing r432845.

Original issue's description:
> Fix nullptr exception on ios_internal
>
> BUG=661668
>
> Committed: https://crrev.com/2a006f7420305db8a069bcc747d4bc343e47f702
> Cr-Commit-Position: refs/heads/master@{#432860}

TBR=jif@chromium.org,jif@google.com,olivierrobin@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=661668

Committed: https://crrev.com/d9269c3ec59239e2f572475ec4610178808c6a0b
Cr-Commit-Position: refs/heads/master@{#433021}
==========

[commit-bot: I haz the power, 2016-11-18 02:42:13]

Patchset 2 (id:??) landed as
https://crrev.com/d9269c3ec59239e2f572475ec4610178808c6a0b
Cr-Commit-Position: refs/heads/master@{#433021}