Protobuf file location refactoring part 1.

This is a series of CLs to move *.proto files into protocol/ directory. Following files will be moved in this CL. - commands.proto - candidates.proto This is just a refactoring. No user-visible behavior change should occur. BUG=none TEST=unittest
google · May 31, 2015 · dbe8005 · dbe8005
1 parent 5afb412
commit dbe8005
Show file tree

Hide file tree

Showing 206 changed files with 377 additions and 284 deletions.
diff --git a/src/android/genproto_java.gyp b/src/android/genproto_java.gyp
@@ -213,8 +213,8 @@
       'type': 'none',
       'variables': {
         'proto_files': [
-          '../session/candidates.proto',
-          '../session/commands.proto',
+          '../protocol/candidates.proto',
+          '../protocol/commands.proto',
         ],
       },
       'actions': [

diff --git a/src/android/jni/mozcjni.cc b/src/android/jni/mozcjni.cc
@@ -39,7 +39,7 @@
 #include "base/system_util.h"
 #include "base/version.h"
 #include "engine/engine_factory.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "session/session_handler.h"
 #include "session/session_usage_observer.h"
 #include "usage_stats/usage_stats_uploader.h"

diff --git a/src/chrome/nacl/nacl_extension.gyp b/src/chrome/nacl/nacl_extension.gyp
@@ -176,13 +176,13 @@
         '../../dictionary/dictionary_base.gyp:user_pos',
         '../../net/net.gyp:http_client',
         '../../net/net.gyp:json_util',
-        '../../session/session_base.gyp:key_parser',
-        '../../session/session_base.gyp:session_protocol',
+        '../../protocol/protocol.gyp:commands_proto',
         '../../session/session.gyp:session',
         '../../session/session.gyp:session_handler',
         '../../session/session.gyp:session_usage_observer',
-        '../../usage_stats/usage_stats_base.gyp:usage_stats',
+        '../../session/session_base.gyp:key_parser',
         '../../usage_stats/usage_stats.gyp:usage_stats_uploader',
+        '../../usage_stats/usage_stats_base.gyp:usage_stats',
       ],
     },
     {

diff --git a/src/chrome/nacl/nacl_session_handler.cc b/src/chrome/nacl/nacl_session_handler.cc
@@ -55,7 +55,7 @@
 #include "net/http_client_pepper.h"
 #include "net/jsoncpp.h"
 #include "net/json_util.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "session/session_handler.h"
 #include "session/session_usage_observer.h"
 #include "usage_stats/usage_stats.h"

diff --git a/src/client/client.cc b/src/client/client.cc
@@ -52,7 +52,7 @@
 #include "base/version.h"
 #include "config/config.pb.h"
 #include "ipc/ipc.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 #ifdef OS_MACOSX
 #include "base/mac_process.h"

diff --git a/src/client/client.gyp b/src/client/client.gyp
@@ -44,7 +44,7 @@
         '../base/base.gyp:base',
         '../config/config.gyp:config_protocol',
         '../ipc/ipc.gyp:ipc',
-        '../session/session_base.gyp:session_protocol',
+        '../protocol/protocol.gyp:commands_proto',
       ],
     },
     {
@@ -56,7 +56,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../config/config.gyp:config_protocol',
-        '../session/session_base.gyp:session_protocol',
+        '../protocol/protocol.gyp:commands_proto',
       ],
     },
   ],

diff --git a/src/client/client.h b/src/client/client.h
@@ -37,7 +37,7 @@
 #include "base/port.h"
 #include "base/scoped_ptr.h"
 #include "client/client_interface.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "testing/base/public/gunit_prod.h"
 // for FRIEND_TEST()
 

diff --git a/src/client/client_interface.h b/src/client/client_interface.h
@@ -34,7 +34,7 @@
 
 #include <string>
 #include "base/port.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 

diff --git a/src/client/client_mock.h b/src/client/client_mock.h
@@ -33,7 +33,7 @@
 #include <map>
 #include <string>
 #include "client/client_interface.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 namespace client {

diff --git a/src/client/client_performance_test_main.cc b/src/client/client_performance_test_main.cc
@@ -43,7 +43,7 @@
 #include "base/util.h"
 #include "client/client.h"
 #include "config/config_handler.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "session/random_keyevents_generator.h"
 
 DEFINE_string(server_path, "", "specify server path");

diff --git a/src/client/client_quality_test_main.cc b/src/client/client_quality_test_main.cc
@@ -41,7 +41,7 @@
 #include "base/util.h"
 #include "client/client.h"
 #include "evaluation/scorer.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 // Test data automatically generated by gen_client_quality_test_data.py
 // TestCase test_cases[] is defined.

diff --git a/src/client/client_scenario_test_main.cc b/src/client/client_scenario_test_main.cc
@@ -43,9 +43,9 @@
 #include "base/system_util.h"
 #include "base/util.h"
 #include "client/client.h"
-#include "renderer/renderer_command.pb.h"
+#include "protocol/commands.pb.h"
 #include "renderer/renderer_client.h"
-#include "session/commands.pb.h"
+#include "renderer/renderer_command.pb.h"
 #include "session/key_parser.h"
 
 DEFINE_bool(display_preedit, false, "display predit to tty");

diff --git a/src/client/client_test.cc b/src/client/client_test.cc
@@ -38,7 +38,7 @@
 #include "base/util.h"
 #include "base/version.h"
 #include "ipc/ipc_mock.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "testing/base/public/gunit.h"
 
 namespace mozc {

diff --git a/src/client/client_test.gyp b/src/client/client_test.gyp
@@ -41,7 +41,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../session/session_base.gyp:session_protocol',
+        '../protocol/protocol.gyp:commands_proto',
         'client.gyp:client',
       ],
       'actions': [

diff --git a/src/composer/composer.cc b/src/composer/composer.cc
@@ -44,7 +44,7 @@
 #include "config/character_form_manager.h"
 #include "config/config.pb.h"
 #include "config/config_handler.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "session/key_event_util.h"
 
 // Use flags instead of constant for performance evaluation.

diff --git a/src/composer/composer.gyp b/src/composer/composer.gyp
@@ -57,10 +57,9 @@
         '../config/config.gyp:config_handler',
         '../config/config.gyp:config_protocol',
         '../protobuf/protobuf.gyp:protobuf',
+        '../protocol/protocol.gyp:commands_proto',
         '../session/session_base.gyp:key_event_util',
         '../session/session_base.gyp:key_parser',
-        # This is needed. GYP is not smart enough about indirect dependencies.
-        '../session/session_base.gyp:session_protocol',
         '../transliteration/transliteration.gyp:transliteration',
       ],
     },
@@ -81,8 +80,8 @@
       'dependencies': [
         '../config/config.gyp:config_handler',
         '../config/config.gyp:config_protocol',
+        '../protocol/protocol.gyp:commands_proto',
         '../session/session_base.gyp:request_test_util',
-        '../session/session_base.gyp:session_protocol',
         '../testing/testing.gyp:gtest_main',
         'composer',
       ],

diff --git a/src/composer/composer.h b/src/composer/composer.h
@@ -42,7 +42,7 @@
 #include "composer/internal/typing_corrector.h"
 #include "composer/internal/transliterators.h"
 #include "composer/type_corrected_query.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "transliteration/transliteration.h"
 // for FRIEND_TEST()
 #include "testing/base/public/gunit_prod.h"

diff --git a/src/composer/composer_main.cc b/src/composer/composer_main.cc
@@ -36,7 +36,7 @@
 #include "base/scoped_ptr.h"
 #include "composer/composition_interface.h"
 #include "composer/table.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "transliteration/transliteration.h"
 
 DEFINE_string(table, "system://romanji-hiragana.tsv",

diff --git a/src/composer/composer_test.cc b/src/composer/composer_test.cc
@@ -42,7 +42,7 @@
 #include "config/character_form_manager.h"
 #include "config/config.pb.h"
 #include "config/config_handler.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "session/key_parser.h"
 #include "testing/base/public/gunit.h"
 

diff --git a/src/composer/internal/typing_corrector_test.cc b/src/composer/internal/typing_corrector_test.cc
@@ -36,7 +36,7 @@
 #include "composer/table.h"
 #include "composer/type_corrected_query.h"
 #include "composer/internal/typing_model.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "testing/base/public/gunit.h"
 
 namespace mozc {

diff --git a/src/composer/internal/typing_model.h b/src/composer/internal/typing_model.h
@@ -33,7 +33,7 @@
 #include "base/port.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 // for FRIEND_TEST()
 #include "testing/base/public/gunit_prod.h"
 

diff --git a/src/composer/table.cc b/src/composer/table.cc
@@ -46,7 +46,7 @@
 #include "composer/internal/typing_model.h"
 #include "config/config.pb.h"
 #include "config/config_handler.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 namespace composer {

diff --git a/src/composer/table_test.cc b/src/composer/table_test.cc
@@ -35,8 +35,8 @@
 #include "composer/internal/composition_input.h"
 #include "config/config.pb.h"
 #include "config/config_handler.h"
+#include "protocol/commands.pb.h"
 #include "testing/base/public/gunit.h"
-#include "session/commands.pb.h"
 
 DECLARE_string(test_tmpdir);
 

diff --git a/src/converter/conversion_request.cc b/src/converter/conversion_request.cc
@@ -30,7 +30,7 @@
 #include "config/config_handler.h"
 #include "converter/conversion_request.h"
 #include "base/logging.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 

diff --git a/src/converter/converter.gyp b/src/converter/converter.gyp
@@ -46,8 +46,8 @@
         '../dictionary/dictionary_base.gyp:pos_matcher',
         '../prediction/prediction.gyp:prediction',
         '../prediction/prediction.gyp:prediction_protocol',
+        '../protocol/protocol.gyp:commands_proto',
         '../rewriter/rewriter.gyp:rewriter',
-        '../session/session_base.gyp:session_protocol',
         '../usage_stats/usage_stats_base.gyp:usage_stats',
         'converter_base.gyp:conversion_request',
         'converter_base.gyp:immutable_converter',

diff --git a/src/converter/converter_base.gyp b/src/converter/converter_base.gyp
@@ -124,8 +124,8 @@
         '../dictionary/dictionary.gyp:suffix_dictionary',
         '../dictionary/dictionary_base.gyp:pos_matcher',
         '../dictionary/dictionary_base.gyp:suppression_dictionary',
+        '../protocol/protocol.gyp:commands_proto',
         '../rewriter/rewriter_base.gyp:gen_rewriter_files#host',
-        '../session/session_base.gyp:session_protocol',
         'connector',
         'immutable_converter_interface',
         'segmenter',
@@ -140,7 +140,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../session/session_base.gyp:session_protocol',
+        '../protocol/protocol.gyp:commands_proto',
         'segments',
         'conversion_request',
       ],
@@ -164,7 +164,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../session/session_base.gyp:session_protocol',
+        '../protocol/protocol.gyp:commands_proto',
       ],
     },
     {

diff --git a/src/converter/converter_main.cc b/src/converter/converter_main.cc
@@ -50,7 +50,7 @@
 #include "engine/engine_factory.h"
 #include "engine/engine_interface.h"
 #include "engine/mock_data_engine_factory.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 DEFINE_int32(max_conversion_candidates_size, 200, "maximum candidates size");
 DEFINE_string(user_profile_dir, "", "path to user profile directory");

diff --git a/src/converter/converter_main.gyp b/src/converter/converter_main.gyp
@@ -46,7 +46,7 @@
         '../engine/engine.gyp:engine',
         '../engine/engine.gyp:engine_factory',
         '../engine/engine.gyp:mock_data_engine_factory',
-        '../session/session_base.gyp:session_protocol',
+        '../protocol/protocol.gyp:commands_proto',
         'converter.gyp:converter',
         'converter_base.gyp:pos_id_printer',
         'converter_base.gyp:segments',

diff --git a/src/converter/converter_regression_test.cc b/src/converter/converter_regression_test.cc
@@ -41,7 +41,7 @@
 #include "converter/segments.h"
 #include "engine/engine_factory.h"
 #include "engine/engine_interface.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "testing/base/public/gunit.h"
 
 #ifdef OS_ANDROID

diff --git a/src/converter/converter_test.cc b/src/converter/converter_test.cc
@@ -70,9 +70,9 @@
 #include "prediction/predictor_interface.h"
 #include "prediction/suggestion_filter.h"
 #include "prediction/user_history_predictor.h"
+#include "protocol/commands.pb.h"
 #include "rewriter/rewriter.h"
 #include "rewriter/rewriter_interface.h"
-#include "session/commands.pb.h"
 #include "testing/base/public/gunit.h"
 #include "transliteration/transliteration.h"
 #include "usage_stats/usage_stats.h"

diff --git a/src/converter/converter_test.gyp b/src/converter/converter_test.gyp
@@ -58,9 +58,9 @@
         '../engine/engine.gyp:engine_factory',
         '../engine/engine.gyp:mock_data_engine_factory',
         '../prediction/prediction_base.gyp:suggestion_filter',
+        '../protocol/protocol.gyp:commands_proto',
         '../rewriter/rewriter.gyp:rewriter',
         '../session/session_base.gyp:request_test_util',
-        '../session/session_base.gyp:session_protocol',
         '../testing/testing.gyp:gtest_main',
         '../transliteration/transliteration.gyp:transliteration',
         '../usage_stats/usage_stats_test.gyp:usage_stats_testing_util',
@@ -86,8 +86,8 @@
         '../config/config.gyp:config_handler',
         '../engine/engine.gyp:engine',
         '../engine/engine.gyp:engine_factory',
+        '../protocol/protocol.gyp:commands_proto',
         '../session/session_base.gyp:request_test_util',
-        '../session/session_base.gyp:session_protocol',
         '../testing/testing.gyp:gtest_main',
       ],
     },

diff --git a/src/converter/immutable_converter.cc b/src/converter/immutable_converter.cc
@@ -59,7 +59,7 @@
 #include "dictionary/pos_matcher.h"
 #include "dictionary/suppression_dictionary.h"
 #include "prediction/suggestion_filter.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 using mozc::dictionary::DictionaryInterface;
 using mozc::dictionary::POSMatcher;

diff --git a/src/converter/immutable_converter_test.cc b/src/converter/immutable_converter_test.cc
@@ -58,7 +58,7 @@
 #include "dictionary/system/value_dictionary.h"
 #include "dictionary/user_dictionary_stub.h"
 #include "prediction/suggestion_filter.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "testing/base/public/gunit.h"
 
 DECLARE_string(test_tmpdir);

diff --git a/src/converter/quality_regression_test.cc b/src/converter/quality_regression_test.cc
@@ -43,7 +43,7 @@
 #include "engine/chromeos_engine_factory.h"
 #include "engine/engine_factory.h"
 #include "engine/engine_interface.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 #include "session/request_test_util.h"
 #include "testing/base/public/gunit.h"
 

diff --git a/src/converter/quality_regression_util.cc b/src/converter/quality_regression_util.cc
@@ -44,7 +44,7 @@
 #include "converter/conversion_request.h"
 #include "converter/converter_interface.h"
 #include "converter/segments.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 namespace quality_regression {

diff --git a/src/data/usage_stats/stats.def b/src/data/usage_stats/stats.def
@@ -288,7 +288,7 @@ Performed_Conversion_InputModeHalfAlphanumeric
 Performed_Conversion_ReportBug
 Performed_Conversion_DeleteSelectedCandidate
 
-# The count of some SessionCommands defined in session/commands.proto
+# The count of some SessionCommands defined in protocol/commands.proto
 SendCommand_Revert
 SendCommand_Submit
 SendCommand_SelectCandidate