Componentize ComponentUpdaterConfigurator

ios/chrome/browser/component_updater/component_updater_configurator.h

Index: ios/chrome/browser/component_updater/component_updater_configurator.h
diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.h b/ios/chrome/browser/component_updater/component_updater_configurator.h
similarity index 54%
copy from chrome/browser/component_updater/chrome_component_updater_configurator.h
copy to ios/chrome/browser/component_updater/component_updater_configurator.h
index 1e777b28d54260feaea0449b1fd0861e614be801..b1c2eef6d9778090625e1c6db44166eb28027f2b 100644
--- a/chrome/browser/component_updater/chrome_component_updater_configurator.h
+++ b/ios/chrome/browser/component_updater/component_updater_configurator.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_COMPONENT_UPDATER_CHROME_COMPONENT_UPDATER_CONFIGURATOR_H_
-#define CHROME_BROWSER_COMPONENT_UPDATER_CHROME_COMPONENT_UPDATER_CONFIGURATOR_H_
+#ifndef IOS_CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_UPDATER_CONFIGURATOR_H_
+#define IOS_CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_UPDATER_CONFIGURATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "components/update_client/configurator.h"
@@ -18,11 +18,10 @@ class URLRequestContextGetter;
 
 namespace component_updater {
 
-scoped_refptr<update_client::Configurator>
-MakeChromeComponentUpdaterConfigurator(
+scoped_refptr<update_client::Configurator> MakeComponentUpdaterConfigurator(

[Sorin Jianu, 2015/08/12 02:27:51]

I don't know how the code is structured on the iOS side.

I see MakeComponentUpdaterConfigurator is introduced in the component_updater
namespace. Would we have a ODR violation if later on, on the Chrome side we
would define a similar name? On Chrome end, we are using
MakeChromeComponentUpdaterConfigurator. Note the Chrome qualification.

[droger, 2015/08/12 08:43:41]

iOS does not use //chrome at all, so technically it should be fine to have the
same names.
However, I would like to avoid using the same names if we can, because this can
be confusing and makes searching code harder.
I renamed to MakeIOSComponentUpdaterConfigurator, that should reduce the risk of
name collision.

     const base::CommandLine* cmdline,
     net::URLRequestContextGetter* context_getter);
 
 }  // namespace component_updater
 
-#endif  // CHROME_BROWSER_COMPONENT_UPDATER_CHROME_COMPONENT_UPDATER_CONFIGURATOR_H_
+#endif  // IOS_CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_UPDATER_CONFIGURATOR_H_