From 3d23ca0518139be109b6d52a8bf01b55c7ca29e3 Mon Sep 17 00:00:00 2001
From: satorux <satorux@chromium.org>
Date: Tue, 10 Feb 2015 00:04:51 -0800
Subject: tools/sort_sources.py: sort C++ source file names in build files.

tools/git/move_source_file.py updates C++ source file names in
build files for you, but it does not sort the updated file names.

With this tool, you can sort C++ source file names in build files
(both GYP and GN files supported) automatically. It's not perfect
but should work reasonably well.

BUG=456014
TEST=Run the tool against some build files. The results are included in the patch.

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

Cr-Commit-Position: refs/heads/master@{#315517}
---
 google_apis/BUILD.gn        |  8 ++++----
 google_apis/google_apis.gyp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'google_apis')

diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn
index 2d9253a..9d10b9e 100644
--- a/google_apis/BUILD.gn
+++ b/google_apis/BUILD.gn
@@ -101,8 +101,6 @@ source_set("google_apis") {
     "gaia/identity_provider.h",
     "gaia/merge_session_helper.cc",
     "gaia/merge_session_helper.h",
-    "gaia/oauth_request_signer.cc",
-    "gaia/oauth_request_signer.h",
     "gaia/oauth2_access_token_consumer.h",
     "gaia/oauth2_access_token_fetcher.cc",
     "gaia/oauth2_access_token_fetcher.h",
@@ -116,6 +114,8 @@ source_set("google_apis") {
     "gaia/oauth2_token_service.h",
     "gaia/oauth2_token_service_request.cc",
     "gaia/oauth2_token_service_request.h",
+    "gaia/oauth_request_signer.cc",
+    "gaia/oauth_request_signer.h",
     "gaia/ubertoken_fetcher.cc",
     "gaia/ubertoken_fetcher.h",
     "google_api_keys.cc",
@@ -199,18 +199,18 @@ source_set("test_support") {
 if (!is_win || link_chrome_on_windows) {
   test("google_apis_unittest") {
     sources = [
-      "google_api_keys_unittest.cc",
       "gaia/gaia_auth_fetcher_unittest.cc",
       "gaia/gaia_auth_util_unittest.cc",
       "gaia/gaia_oauth_client_unittest.cc",
       "gaia/google_service_auth_error_unittest.cc",
       "gaia/merge_session_helper_unittest.cc",
-      "gaia/oauth_request_signer_unittest.cc",
       "gaia/oauth2_access_token_fetcher_impl_unittest.cc",
       "gaia/oauth2_api_call_flow_unittest.cc",
       "gaia/oauth2_mint_token_flow_unittest.cc",
       "gaia/oauth2_token_service_unittest.cc",
+      "gaia/oauth_request_signer_unittest.cc",
       "gaia/ubertoken_fetcher_unittest.cc",
+      "google_api_keys_unittest.cc",
     ]
 
     configs += [ ":key_defines" ]
diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp
index 7383181..7859a73 100644
--- a/google_apis/google_apis.gyp
+++ b/google_apis/google_apis.gyp
@@ -92,11 +92,9 @@
         'gaia/identity_provider.h',
         'gaia/merge_session_helper.cc',
         'gaia/merge_session_helper.h',
-        'gaia/oauth_request_signer.cc',
-        'gaia/oauth_request_signer.h',
         'gaia/oauth2_access_token_consumer.h',
-        'gaia/oauth2_access_token_fetcher.h',
         'gaia/oauth2_access_token_fetcher.cc',
+        'gaia/oauth2_access_token_fetcher.h',
         'gaia/oauth2_access_token_fetcher_impl.cc',
         'gaia/oauth2_access_token_fetcher_impl.h',
         'gaia/oauth2_api_call_flow.cc',
@@ -107,6 +105,8 @@
         'gaia/oauth2_token_service.h',
         'gaia/oauth2_token_service_request.cc',
         'gaia/oauth2_token_service_request.h',
+        'gaia/oauth_request_signer.cc',
+        'gaia/oauth_request_signer.h',
         'gaia/ubertoken_fetcher.cc',
         'gaia/ubertoken_fetcher.h',
         'google_api_keys.cc',
@@ -132,20 +132,20 @@
         '..',
       ],
       'sources': [
-        'google_api_keys_unittest.cc',
         'gaia/account_tracker_unittest.cc',
         'gaia/gaia_auth_fetcher_unittest.cc',
         'gaia/gaia_auth_util_unittest.cc',
         'gaia/gaia_oauth_client_unittest.cc',
         'gaia/google_service_auth_error_unittest.cc',
         'gaia/merge_session_helper_unittest.cc',
-        'gaia/oauth_request_signer_unittest.cc',
         'gaia/oauth2_access_token_fetcher_impl_unittest.cc',
         'gaia/oauth2_api_call_flow_unittest.cc',
         'gaia/oauth2_mint_token_flow_unittest.cc',
         'gaia/oauth2_token_service_request_unittest.cc',
         'gaia/oauth2_token_service_unittest.cc',
+        'gaia/oauth_request_signer_unittest.cc',
         'gaia/ubertoken_fetcher_unittest.cc',
+        'google_api_keys_unittest.cc',
       ],
       'conditions': [
         ['enable_extensions==1', {
-- 
cgit v1.1