summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 03:31:31 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 03:31:31 +0000
commit7af5e1a7bd7df35c4b62e1020bd532c508e6d2e7 (patch)
treece8c357731db748d58d299f5bbc920eda6e9f826 /chrome/common
parent8265ef0cf3fdd1c50535a996bf3dfdd4004ab867 (diff)
downloadchromium_src-7af5e1a7bd7df35c4b62e1020bd532c508e6d2e7.zip
chromium_src-7af5e1a7bd7df35c4b62e1020bd532c508e6d2e7.tar.gz
chromium_src-7af5e1a7bd7df35c4b62e1020bd532c508e6d2e7.tar.bz2
Move JSON schema validator code into its own directory in chrome/common
Also add an OWNERS file there with some people who've worked on JSON schema in the extensions/apps system. BUG=none Review URL: https://chromiumcodereview.appspot.com/12886024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/json_schema/OWNERS5
-rw-r--r--chrome/common/json_schema/json_schema_constants.cc (renamed from chrome/common/json_schema_constants.cc)2
-rw-r--r--chrome/common/json_schema/json_schema_constants.h (renamed from chrome/common/json_schema_constants.h)6
-rw-r--r--chrome/common/json_schema/json_schema_validator.cc (renamed from chrome/common/json_schema_validator.cc)4
-rw-r--r--chrome/common/json_schema/json_schema_validator.h (renamed from chrome/common/json_schema_validator.h)6
-rw-r--r--chrome/common/json_schema/json_schema_validator_unittest.cc (renamed from chrome/common/json_schema_validator_unittest.cc)4
-rw-r--r--chrome/common/json_schema/json_schema_validator_unittest_base.cc (renamed from chrome/common/json_schema_validator_unittest_base.cc)6
-rw-r--r--chrome/common/json_schema/json_schema_validator_unittest_base.h (renamed from chrome/common/json_schema_validator_unittest_base.h)6
-rw-r--r--chrome/common/web_apps.cc2
-rw-r--r--chrome/common/web_apps_unittest.cc2
10 files changed, 24 insertions, 19 deletions
diff --git a/chrome/common/json_schema/OWNERS b/chrome/common/json_schema/OWNERS
new file mode 100644
index 0000000..f7e95c9
--- /dev/null
+++ b/chrome/common/json_schema/OWNERS
@@ -0,0 +1,5 @@
+asargent@chromium.org
+calamity@chromium.org
+kalman@chromium.org
+koz@chromium.org
+mpcomplete@chromium.org
diff --git a/chrome/common/json_schema_constants.cc b/chrome/common/json_schema/json_schema_constants.cc
index c364bdf..cfdca28 100644
--- a/chrome/common/json_schema_constants.cc
+++ b/chrome/common/json_schema/json_schema_constants.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/json_schema_constants.h"
+#include "chrome/common/json_schema/json_schema_constants.h"
namespace json_schema_constants {
diff --git a/chrome/common/json_schema_constants.h b/chrome/common/json_schema/json_schema_constants.h
index 8e3a7ee..fa4b80b 100644
--- a/chrome/common/json_schema_constants.h
+++ b/chrome/common/json_schema/json_schema_constants.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_JSON_SCHEMA_CONSTANTS_H_
-#define CHROME_COMMON_JSON_SCHEMA_CONSTANTS_H_
+#ifndef CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_CONSTANTS_H_
+#define CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_CONSTANTS_H_
// These constants are shared by code that uses JSON schemas.
namespace json_schema_constants {
@@ -35,4 +35,4 @@ extern const char kType[];
} // namespace json_schema_constants
-#endif // CHROME_COMMON_JSON_SCHEMA_CONSTANTS_H_
+#endif // CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_CONSTANTS_H_
diff --git a/chrome/common/json_schema_validator.cc b/chrome/common/json_schema/json_schema_validator.cc
index 64d64b6..a303442 100644
--- a/chrome/common/json_schema_validator.cc
+++ b/chrome/common/json_schema/json_schema_validator.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/json_schema_validator.h"
+#include "chrome/common/json_schema/json_schema_validator.h"
#include <cfloat>
#include <cmath>
@@ -10,7 +10,7 @@
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
-#include "chrome/common/json_schema_constants.h"
+#include "chrome/common/json_schema/json_schema_constants.h"
#include "ui/base/l10n/l10n_util.h"
namespace schema = json_schema_constants;
diff --git a/chrome/common/json_schema_validator.h b/chrome/common/json_schema/json_schema_validator.h
index fc9c01e..e9a1a92 100644
--- a/chrome/common/json_schema_validator.h
+++ b/chrome/common/json_schema/json_schema_validator.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_JSON_SCHEMA_VALIDATOR_H_
-#define CHROME_COMMON_JSON_SCHEMA_VALIDATOR_H_
+#ifndef CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_VALIDATOR_H_
+#define CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_VALIDATOR_H_
#include <map>
#include <string>
@@ -222,4 +222,4 @@ class JSONSchemaValidator {
DISALLOW_COPY_AND_ASSIGN(JSONSchemaValidator);
};
-#endif // CHROME_COMMON_JSON_SCHEMA_VALIDATOR_H_
+#endif // CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_VALIDATOR_H_
diff --git a/chrome/common/json_schema_validator_unittest.cc b/chrome/common/json_schema/json_schema_validator_unittest.cc
index 5ea8d1c..b2fdc54 100644
--- a/chrome/common/json_schema_validator_unittest.cc
+++ b/chrome/common/json_schema/json_schema_validator_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/values.h"
-#include "chrome/common/json_schema_validator.h"
-#include "chrome/common/json_schema_validator_unittest_base.h"
+#include "chrome/common/json_schema/json_schema_validator.h"
+#include "chrome/common/json_schema/json_schema_validator_unittest_base.h"
#include "testing/gtest/include/gtest/gtest.h"
class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase {
diff --git a/chrome/common/json_schema_validator_unittest_base.cc b/chrome/common/json_schema/json_schema_validator_unittest_base.cc
index 8b901e7..ecd9846 100644
--- a/chrome/common/json_schema_validator_unittest_base.cc
+++ b/chrome/common/json_schema/json_schema_validator_unittest_base.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/json_schema_validator_unittest_base.h"
+#include "chrome/common/json_schema/json_schema_validator_unittest_base.h"
#include <cfloat>
#include <cmath>
@@ -16,8 +16,8 @@
#include "base/stringprintf.h"
#include "base/values.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/json_schema_constants.h"
-#include "chrome/common/json_schema_validator.h"
+#include "chrome/common/json_schema/json_schema_constants.h"
+#include "chrome/common/json_schema/json_schema_validator.h"
namespace schema = json_schema_constants;
diff --git a/chrome/common/json_schema_validator_unittest_base.h b/chrome/common/json_schema/json_schema_validator_unittest_base.h
index 6208489..63988f5 100644
--- a/chrome/common/json_schema_validator_unittest_base.h
+++ b/chrome/common/json_schema/json_schema_validator_unittest_base.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_JSON_SCHEMA_VALIDATOR_UNITTEST_BASE_H_
-#define CHROME_COMMON_JSON_SCHEMA_VALIDATOR_UNITTEST_BASE_H_
+#ifndef CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_VALIDATOR_UNITTEST_BASE_H_
+#define CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_VALIDATOR_UNITTEST_BASE_H_
#include "testing/gtest/include/gtest/gtest.h"
@@ -60,4 +60,4 @@ class JSONSchemaValidatorTestBase : public testing::Test {
ValidatorType type_;
};
-#endif // CHROME_COMMON_JSON_SCHEMA_VALIDATOR_UNITTEST_BASE_H_
+#endif // CHROME_COMMON_JSON_SCHEMA_JSON_SCHEMA_VALIDATOR_UNITTEST_BASE_H_
diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc
index e2f726d..e73ea32 100644
--- a/chrome/common/web_apps.cc
+++ b/chrome/common/web_apps.cc
@@ -13,7 +13,7 @@
#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/common/json_schema_validator.h"
+#include "chrome/common/json_schema/json_schema_validator.h"
#include "googleurl/src/gurl.h"
#include "grit/common_resources.h"
#include "grit/generated_resources.h"
diff --git a/chrome/common/web_apps_unittest.cc b/chrome/common/web_apps_unittest.cc
index 01f39f3..8d1bb50 100644
--- a/chrome/common/web_apps_unittest.cc
+++ b/chrome/common/web_apps_unittest.cc
@@ -12,7 +12,7 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/json_schema_validator.h"
+#include "chrome/common/json_schema/json_schema_validator.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {