Migrate md history test code to ScopedFeatureList.

Migrate md history test code to ScopedFeatureList.

ScopedFeatureList ensures that the previous FeatureList
is restored at the end of the test, which the previous
code did not do.

BUG=620435
Committed: https://crrev.com/0e9bca93e104ad63ea99ce376c6923182cf0c803
Cr-Commit-Position: refs/heads/master@{#433633}

[Alexei Svitkine (slow), 2016-11-17 22:43:10]

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

[commit-bot: I haz the power, 2016-11-17 22:44:16]

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, 2016-11-17 22:51:00]

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

[commit-bot: I haz the power, 2016-11-17 22:51:02]

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...)

[Alexei Svitkine (slow), 2016-11-17 23:00:11]

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

[Alexei Svitkine (slow), 2016-11-17 23:01:02]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2016-11-17 23:03:37]

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, 2016-11-18 00:29:58]

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

[commit-bot: I haz the power, 2016-11-18 00:29:59]

Dry run: Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Alexei Svitkine (slow), 2016-11-18 21:57:41]

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

[Alexei Svitkine (slow), 2016-11-18 21:57:56]

Patchset #1 (id:20001) has been deleted

[commit-bot: I haz the power, 2016-11-18 21:58:53]

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

[Alexei Svitkine (slow), 2016-11-18 21:58:57]

asvitkine@chromium.org changed reviewers:
+ dbeam@chromium.org

[Dan Beam, 2016-11-18 22:12:28]

i still think that just updating the method to return a std::unique_ptr<> to a
scoped thing is more elegant, but it's not really much different.

lgtm but can you remove the extra md_history_ui.h #includes?

[Alexei Svitkine (slow), 2016-11-18 22:18:25]

asvitkine@chromium.org changed reviewers:
+ sky@chromium.org

[Alexei Svitkine (slow), 2016-11-18 22:18:26]

+sky for UI owners

[sky, 2016-11-19 16:29:26]

LGTM

[Alexei Svitkine (slow), 2016-11-19 17:31:17]

The CQ bit was checked by asvitkine@chromium.org

[Alexei Svitkine (slow), 2016-11-19 17:31:20]

The patchset sent to the CQ was uploaded after l-g-t-m from dbeam@chromium.org
Link to the patchset: https://codereview.chromium.org/2511993002/#ps60001
(title: "Remove includes.")

[commit-bot: I haz the power, 2016-11-19 17: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, 2016-11-19 18:16:58]

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

[commit-bot: I haz the power, 2016-11-19 18:17:00]

Failed to apply patch for
chrome/browser/ui/webui/browsing_history_handler_unittest.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/ui/webui/browsing_history_handler_unittest.cc:11
  error: chrome/browser/ui/webui/browsing_history_handler_unittest.cc: patch
does not apply

Patch:       chrome/browser/ui/webui/browsing_history_handler_unittest.cc
Index: chrome/browser/ui/webui/browsing_history_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
index
fed23eb425928f074f25f72574ee6694608732b0..3d23a6b54b1e9d54402e3fce540e9130f70fbac3
100644
--- a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
+++ b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
@@ -11,6 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "chrome/browser/history/web_history_service_factory.h"
@@ -20,6 +21,7 @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/browser_sync/test_profile_sync_service.h"
 #include "components/history/core/test/fake_web_history_service.h"
@@ -34,10 +36,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-#if !defined(OS_ANDROID)
-#include "chrome/browser/ui/webui/md_history_ui.h"
-#endif
-
 namespace {
 
 struct TestResult {
@@ -422,7 +420,8 @@ TEST_F(BrowsingHistoryHandlerTest,
ObservingWebHistoryDeletions) {
 
 #if !defined(OS_ANDROID)
 TEST_F(BrowsingHistoryHandlerTest, MdTruncatesTitles) {
-  MdHistoryUI::SetEnabledForTesting(true);
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndEnableFeature(features::kMaterialDesignHistory);
 
   history::URLResult long_result(
      
GURL("http://looooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"

[Alexei Svitkine (slow), 2016-11-21 15:58:27]

The CQ bit was checked by asvitkine@chromium.org

[Alexei Svitkine (slow), 2016-11-21 15:58:27]

The patchset sent to the CQ was uploaded after l-g-t-m from dbeam@chromium.org,
sky@chromium.org
Link to the patchset: https://codereview.chromium.org/2511993002/#ps80001
(title: "rebase")

[commit-bot: I haz the power, 2016-11-21 15:58:50]

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-21 20:00:35]

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

[commit-bot: I haz the power, 2016-11-21 20:00:36]

Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Alexei Svitkine (slow), 2016-11-21 20:09:08]

The CQ bit was checked by asvitkine@chromium.org

[commit-bot: I haz the power, 2016-11-21 20: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-21 20:38:43]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1479758948961950,
"parent_rev": "37c576e45a17c55595fb1282e4b10557e8106f4a", "commit_rev":
"68f1967a1f8823c5b4eee68467bc8233dc16c54d"}

[commit-bot: I haz the power, 2016-11-21 20:39:11]

Committed patchset #3 (id:80001)

[commit-bot: I haz the power, 2016-11-21 20:41:54]

Description was changed from

==========
Migrate md history test code to ScopedFeatureList.

ScopedFeatureList ensures that the previous FeatureList
is restored at the end of the test, which the previous
code did not do.

BUG=620435
==========

to

==========
Migrate md history test code to ScopedFeatureList.

ScopedFeatureList ensures that the previous FeatureList
is restored at the end of the test, which the previous
code did not do.

BUG=620435

Committed: https://crrev.com/0e9bca93e104ad63ea99ce376c6923182cf0c803
Cr-Commit-Position: refs/heads/master@{#433633}
==========

[commit-bot: I haz the power, 2016-11-21 20:41:55]

Patchset 3 (id:??) landed as
https://crrev.com/0e9bca93e104ad63ea99ce376c6923182cf0c803
Cr-Commit-Position: refs/heads/master@{#433633}