Move dom_distiller_service_factory to //chrome.

Treat the concept of "how to get the DomDistillerService to use for the given
browsing context" as an embedder-level concept rather than a concept within the
dom_distiller component.

Review URL: https://codereview.chromium.org/100623006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238958 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 12 insertions, 10 deletions

diff --git a/chrome/browser/dom_distiller/OWNERS b/chrome/browser/dom_distiller/OWNERS
new file mode 100644
index 0000000..f2ce81c
--- /dev/null
+++ b/chrome/browser/dom_distiller/OWNERS
@@ -0,0 +1,3 @@
+bengr@chromium.org
+cjhopman@chromium.org
+nyquist@chromium.org
diff --git a/components/dom_distiller/content/dom_distiller_service_factory.cc b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
index 0b88cf3..7bc75c3 100644
--- a/components/dom_distiller/content/dom_distiller_service_factory.cc
+++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/dom_distiller/content/dom_distiller_service_factory.h"
+#include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
@@ -72,9 +72,8 @@ BrowserContextKeyedService* DomDistillerServiceFactory::BuildServiceInstanceFor(
 content::BrowserContext* DomDistillerServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // TODO(cjhopman): Do we want this to be
-  // GetBrowserContextRedirectedInIncognito? If so, find some way to use that in
-  // components/.
+  // GetBrowserContextRedirectedInIncognito?
   return context;
 }
 
-}  // namespace apps
+}  // namespace dom_distiller
diff --git a/components/dom_distiller/content/dom_distiller_service_factory.h b/chrome/browser/dom_distiller/dom_distiller_service_factory.h
index 33d1931..b5a2c0e 100644
--- a/components/dom_distiller/content/dom_distiller_service_factory.h
+++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_DOM_DISTILLER_SERVICE_FACTORY_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_DOM_DISTILLER_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
@@ -50,4 +50,4 @@ class DomDistillerServiceFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace dom_distiller
 
-#endif
+#endif  // CHROME_BROWSER_DOM_DISTILLER_DOM_DISTILLER_SERVICE_FACTORY_H_
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 6d25249..83d3d40 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
@@ -62,7 +63,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
-#include "components/dom_distiller/content/dom_distiller_service_factory.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/syncable_service.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9b14969..48cac58 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -523,6 +523,8 @@
         'browser/diagnostics/recon_diagnostics.h',
         'browser/diagnostics/sqlite_diagnostics.cc',
         'browser/diagnostics/sqlite_diagnostics.h',
+        'browser/dom_distiller/dom_distiller_service_factory.cc',
+        'browser/dom_distiller/dom_distiller_service_factory.h',
         'browser/download/all_download_item_notifier.cc',
         'browser/download/all_download_item_notifier.h',
         'browser/download/chrome_download_manager_delegate.cc',
diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi
index c60f063..f3c695a 100644
--- a/components/dom_distiller.gypi
+++ b/components/dom_distiller.gypi
@@ -112,8 +112,6 @@
               'sources': [
                 'dom_distiller/content/distiller_page_web_contents.cc',
                 'dom_distiller/content/distiller_page_web_contents.h',
-                'dom_distiller/content/dom_distiller_service_factory.cc',
-                'dom_distiller/content/dom_distiller_service_factory.h',
               ],
             },
           ],