Move chrome/common/omaha_query_params.{h,cc} into their own directory

Also add an OWNERS file, so we don't have to keep bugging sky@ or
other toplevel reviewers.

BUG=none

Review URL: https://chromiumcodereview.appspot.com/14307009

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

8 files changed, 12 insertions, 10 deletions

diff --git a/chrome/browser/component_updater/component_updater_configurator.cc b/chrome/browser/component_updater/component_updater_configurator.cc
index 0312e67..78b9155 100644
--- a/chrome/browser/component_updater/component_updater_configurator.cc
+++ b/chrome/browser/component_updater/component_updater_configurator.cc
@@ -15,7 +15,7 @@
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/omaha_query_params.h"
+#include "chrome/common/omaha_query_params/omaha_query_params.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
index 8f48641..5689587 100644
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/omaha_query_params.h"
+#include "chrome/common/omaha_query_params/omaha_query_params.h"
 #include "content/public/browser/browser_thread.h"
 
 using chrome::OmahaQueryParams;
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index e2c87ac..abdd9db 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -45,7 +45,7 @@
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
-#include "chrome/common/omaha_query_params.h"
+#include "chrome/common/omaha_query_params/omaha_query_params.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
diff --git a/chrome/browser/extensions/updater/manifest_fetch_data.cc b/chrome/browser/extensions/updater/manifest_fetch_data.cc
index 130f0c9..c243f9b 100644
--- a/chrome/browser/extensions/updater/manifest_fetch_data.cc
+++ b/chrome/browser/extensions/updater/manifest_fetch_data.cc
@@ -12,7 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/common/omaha_query_params.h"
+#include "chrome/common/omaha_query_params/omaha_query_params.h"
 #include "net/base/escape.h"
 
 namespace {
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e44e390..0360a90 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -363,8 +363,8 @@
         'common/nacl_messages.h',
         'common/nacl_types.cc',
         'common/nacl_types.h',
-        'common/omaha_query_params.cc',
-        'common/omaha_query_params.h',
+        'common/omaha_query_params/omaha_query_params.cc',
+        'common/omaha_query_params/omaha_query_params.h',
         'common/omnibox_focus_state.h',
         'common/one_click_signin_messages.h',
         'common/pepper_flash.cc',
diff --git a/chrome/common/omaha_query_params/OWNERS b/chrome/common/omaha_query_params/OWNERS
new file mode 100644
index 0000000..c089b54
--- /dev/null
+++ b/chrome/common/omaha_query_params/OWNERS
@@ -0,0 +1,2 @@
+asargent@chromium.org
+cpu@chromium.org
diff --git a/chrome/common/omaha_query_params.cc b/chrome/common/omaha_query_params/omaha_query_params.cc
index 3c85308..5286be6 100644
--- a/chrome/common/omaha_query_params.cc
+++ b/chrome/common/omaha_query_params/omaha_query_params.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 "chrome/common/omaha_query_params.h"
+#include "chrome/common/omaha_query_params/omaha_query_params.h"
 
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
diff --git a/chrome/common/omaha_query_params.h b/chrome/common/omaha_query_params/omaha_query_params.h
index d581732..b7820c0 100644
--- a/chrome/common/omaha_query_params.h
+++ b/chrome/common/omaha_query_params/omaha_query_params.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 CHROME_COMMON_OMAHA_QUERY_PARAMS_H_
-#define CHROME_COMMON_OMAHA_QUERY_PARAMS_H_
+#ifndef CHROME_COMMON_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_H_
+#define CHROME_COMMON_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_H_
 
 #include <string>
 
@@ -44,4 +44,4 @@ class OmahaQueryParams {
 
 }  // namespace chrome
 
-#endif  // CHROME_COMMON_OMAHA_QUERY_PARAMS_H_
+#endif  // CHROME_COMMON_OMAHA_QUERY_PARAMS_OMAHA_QUERY_PARAMS_H_