| Index: chrome/browser/sync/test/integration/typed_urls_helper.cc
|
| diff --git a/chrome/browser/sync/test/integration/typed_urls_helper.cc b/chrome/browser/sync/test/integration/typed_urls_helper.cc
|
| index b0b4c4f8ee98e3ae029dae54c67dbdf5b2226aa5..bec77f9d753896fed92a69f7560a8b5571690fc1 100644
|
| --- a/chrome/browser/sync/test/integration/typed_urls_helper.cc
|
| +++ b/chrome/browser/sync/test/integration/typed_urls_helper.cc
|
| @@ -164,9 +164,9 @@ void AddToHistory(history::HistoryService* service,
|
| history::VisitSource source,
|
| const base::Time& timestamp) {
|
| service->AddPage(url, timestamp,
|
| - NULL, // scope
|
| - 1234, // nav_entry_id
|
| - GURL(), // referrer
|
| + nullptr, // scope
|
| + 1234, // nav_entry_id
|
| + GURL(), // referrer
|
| history::RedirectList(), transition, source, false);
|
| }
|
|
|
| @@ -226,7 +226,7 @@ void RemoveVisitsFromHistoryService(history::HistoryService* service,
|
| wait_event.Wait();
|
| }
|
|
|
| -static base::Time* timestamp = NULL;
|
| +static base::Time* timestamp = nullptr;
|
|
|
| } // namespace
|
|
|
|
|