Move classes to //components/ntp_tiles.

components/ntp_tiles/popular_sites.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/android/ntp/popular_sites.h"
+#include "components/ntp_tiles/popular_sites.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/common/chrome_paths.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/ntp_tiles/pref_names.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/search_engine_type.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/variations/service/variations_service.h"
 #include "net/base/load_flags.h"
@@ skipping 136 matching lines @@
         &error_line, &error_column);
     if (value) {
       success_callback.Run(std::move(value));
     } else {
       error_callback.Run(base::StringPrintf("%s (%d:%d)", error_msg.c_str(),
                                             error_line, error_column));
     }
   }
 };
 
 using UntrustedJsonParser = JsonUnsafeParser;

[blundell, 2016/06/08 13:59:32]

This seems unfortunately hacky :(. Why not just pass in a ParseJson() callback
that the embedder provides?

[sfiera, 2016/06/09 14:42:40]

What do you find hacky about it? Our problem is that we want to use a different
JSON parser on iOS, and this seems like a straightforward way of expressing
that.

 #else
 using UntrustedJsonParser = safe_json::SafeJsonParser;
 #endif
 
 }  // namespace
 
-base::FilePath ChromePopularSites::GetDirectory() {
-  base::FilePath dir;
-  PathService::Get(chrome::DIR_USER_DATA, &dir);
-  return dir;  // empty if PathService::Get() failed.
-}
-
 PopularSites::Site::Site(const base::string16& title,
                          const GURL& url,
                          const GURL& favicon_url,
                          const GURL& large_icon_url,
                          const GURL& thumbnail_url)
     : title(title),
       url(url),
       favicon_url(favicon_url),
       large_icon_url(large_icon_url),
       thumbnail_url(thumbnail_url) {}
@@ skipping 243 matching lines @@
     DLOG(WARNING) << "Download country site list failed";
     is_fallback_ = true;
     pending_country_ = kPopularSitesDefaultCountryCode;
     pending_version_ = kPopularSitesDefaultVersion;
     FetchPopularSites(GetPopularSitesURL());
   } else {
     DLOG(WARNING) << "Download fallback site list failed";
     callback_.Run(false);
   }
 }