Put SuffixToken and SuffixDictionary into mozc::dictionary namespace.

This is just a code cleanup.  Hence no behavior change should occur.

BUG=none
TEST=unittest
diff --git a/src/converter/converter_test.cc b/src/converter/converter_test.cc
index 9443536..be69abc 100644
--- a/src/converter/converter_test.cc
+++ b/src/converter/converter_test.cc
@@ -58,6 +58,7 @@
 #include "dictionary/pos_group.h"
 #include "dictionary/pos_matcher.h"
 #include "dictionary/suffix_dictionary.h"
+#include "dictionary/suffix_dictionary_token.h"
 #include "dictionary/suppression_dictionary.h"
 #include "dictionary/system/system_dictionary.h"
 #include "dictionary/system/value_dictionary.h"
@@ -81,15 +82,14 @@
 DECLARE_string(test_tmpdir);
 
 using mozc::dictionary::DictionaryImpl;
+using mozc::dictionary::SuffixDictionary;
+using mozc::dictionary::SuffixToken;
 using mozc::dictionary::SuppressionDictionary;
 using mozc::dictionary::SystemDictionary;
 using mozc::dictionary::ValueDictionary;
 using mozc::usage_stats::UsageStats;
 
 namespace mozc {
-
-struct SuffixToken;
-
 namespace {
 
 class StubPredictor : public PredictorInterface {
diff --git a/src/converter/immutable_converter_test.cc b/src/converter/immutable_converter_test.cc
index fe9a149..0dbab2b 100644
--- a/src/converter/immutable_converter_test.cc
+++ b/src/converter/immutable_converter_test.cc
@@ -53,6 +53,7 @@
 #include "dictionary/dictionary_interface.h"
 #include "dictionary/pos_group.h"
 #include "dictionary/suffix_dictionary.h"
+#include "dictionary/suffix_dictionary_token.h"
 #include "dictionary/suppression_dictionary.h"
 #include "dictionary/system/system_dictionary.h"
 #include "dictionary/system/value_dictionary.h"
@@ -64,14 +65,13 @@
 DECLARE_string(test_tmpdir);
 
 using mozc::dictionary::DictionaryImpl;
+using mozc::dictionary::SuffixDictionary;
+using mozc::dictionary::SuffixToken;
 using mozc::dictionary::SuppressionDictionary;
 using mozc::dictionary::SystemDictionary;
 using mozc::dictionary::ValueDictionary;
 
 namespace mozc {
-
-struct SuffixToken;
-
 namespace {
 
 void SetCandidate(const string &key, const string &value, Segment *segment) {
diff --git a/src/converter/nbest_generator_test.cc b/src/converter/nbest_generator_test.cc
index 816856d..6861379 100644
--- a/src/converter/nbest_generator_test.cc
+++ b/src/converter/nbest_generator_test.cc
@@ -49,6 +49,7 @@
 #include "dictionary/dictionary_interface.h"
 #include "dictionary/pos_group.h"
 #include "dictionary/suffix_dictionary.h"
+#include "dictionary/suffix_dictionary_token.h"
 #include "dictionary/suppression_dictionary.h"
 #include "dictionary/system/system_dictionary.h"
 #include "dictionary/system/value_dictionary.h"
@@ -59,14 +60,13 @@
 DECLARE_string(test_tmpdir);
 
 using mozc::dictionary::DictionaryImpl;
+using mozc::dictionary::SuffixDictionary;
+using mozc::dictionary::SuffixToken;
 using mozc::dictionary::SuppressionDictionary;
 using mozc::dictionary::SystemDictionary;
 using mozc::dictionary::ValueDictionary;
 
 namespace mozc {
-
-struct SuffixToken;
-
 namespace {
 
 class MockDataAndImmutableConverter {
diff --git a/src/data_manager/chromeos/chromeos_data_manager.cc b/src/data_manager/chromeos/chromeos_data_manager.cc
index 22e6927..0ab14ca 100644
--- a/src/data_manager/chromeos/chromeos_data_manager.cc
+++ b/src/data_manager/chromeos/chromeos_data_manager.cc
@@ -42,6 +42,8 @@
 #include "rewriter/usage_rewriter_data_structs.h"
 #endif  // NO_USAGE_REWRITER
 
+using mozc::dictionary::SuffixToken;
+
 namespace mozc {
 namespace chromeos {
 
diff --git a/src/data_manager/chromeos/chromeos_data_manager.h b/src/data_manager/chromeos/chromeos_data_manager.h
index 5a2dcd3..315ebd5 100644
--- a/src/data_manager/chromeos/chromeos_data_manager.h
+++ b/src/data_manager/chromeos/chromeos_data_manager.h
@@ -49,7 +49,7 @@
       size_t *bitarray_num_bytes, const char **bitarray_data,
       const BoundaryData **boundary_data) const;
   virtual void GetSystemDictionaryData(const char **data, int *size) const;
-  virtual void GetSuffixDictionaryData(const SuffixToken **tokens,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **tokens,
                                        size_t *size) const;
   virtual void GetReadingCorrectionData(const ReadingCorrectionItem **array,
                                         size_t *size) const;
diff --git a/src/data_manager/chromeos/chromeos_user_pos_manager.h b/src/data_manager/chromeos/chromeos_user_pos_manager.h
index e1897e9..880bffc 100644
--- a/src/data_manager/chromeos/chromeos_user_pos_manager.h
+++ b/src/data_manager/chromeos/chromeos_user_pos_manager.h
@@ -60,7 +60,7 @@
       size_t *bitarray_num_bytes, const char **bitarray_data,
       const BoundaryData **boundary_data) const {}
   virtual void GetSystemDictionaryData(const char **data, int *size) const {}
-  virtual void GetSuffixDictionaryData(const SuffixToken **data,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **data,
                                        size_t *size) const {}
   virtual void GetReadingCorrectionData(const ReadingCorrectionItem **array,
                                         size_t *size) const {}
diff --git a/src/data_manager/data_manager_interface.h b/src/data_manager/data_manager_interface.h
index 1c45091..31a62fa 100644
--- a/src/data_manager/data_manager_interface.h
+++ b/src/data_manager/data_manager_interface.h
@@ -40,12 +40,13 @@
 struct BoundaryData;
 struct CounterSuffixEntry;
 struct ReadingCorrectionItem;
-struct SuffixToken;
 #ifndef NO_USAGE_REWRITER
 struct ConjugationSuffix;
 struct UsageDictItem;
 #endif  // NO_USAGE_REWRITER
 
+namespace dictionary { struct SuffixToken; }
+
 // Builds those objects that depend on a set of embedded data generated from
 // files in data/dictionary, such as dictionary.txt, id.def, etc.
 class DataManagerInterface {
@@ -76,7 +77,7 @@
   virtual void GetSystemDictionaryData(const char **data, int *size) const = 0;
 
   // Returns the address of suffix dictionary and its size.
-  virtual void GetSuffixDictionaryData(const SuffixToken **tokens,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **tokens,
                                        size_t *size) const = 0;
 
   // Gets a reference to reading correction data array and its size.
diff --git a/src/data_manager/oss/oss_data_manager.cc b/src/data_manager/oss/oss_data_manager.cc
index 1829ff2..f421118 100644
--- a/src/data_manager/oss/oss_data_manager.cc
+++ b/src/data_manager/oss/oss_data_manager.cc
@@ -41,6 +41,8 @@
 #include "rewriter/usage_rewriter_data_structs.h"
 #endif  // NO_USAGE_REWRITER
 
+using mozc::dictionary::SuffixToken;
+
 namespace mozc {
 namespace oss {
 
diff --git a/src/data_manager/oss/oss_data_manager.h b/src/data_manager/oss/oss_data_manager.h
index c15d8ea..8420d7c 100644
--- a/src/data_manager/oss/oss_data_manager.h
+++ b/src/data_manager/oss/oss_data_manager.h
@@ -60,7 +60,7 @@
       size_t *bitarray_num_bytes, const char **bitarray_data,
       const BoundaryData **boundary_data) const;
   virtual void GetSystemDictionaryData(const char **data, int *size) const;
-  virtual void GetSuffixDictionaryData(const SuffixToken **tokens,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **tokens,
                                        size_t *size) const;
   virtual void GetReadingCorrectionData(const ReadingCorrectionItem **array,
                                         size_t *size) const;
diff --git a/src/data_manager/oss/oss_user_pos_manager.h b/src/data_manager/oss/oss_user_pos_manager.h
index 9c71844..d4f8e19 100644
--- a/src/data_manager/oss/oss_user_pos_manager.h
+++ b/src/data_manager/oss/oss_user_pos_manager.h
@@ -61,7 +61,7 @@
       size_t *bitarray_num_bytes, const char **bitarray_data,
       const BoundaryData **boundary_data) const {}
   virtual void GetSystemDictionaryData(const char **data, int *size) const {}
-  virtual void GetSuffixDictionaryData(const SuffixToken **data,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **data,
                                        size_t *size) const {}
   virtual void GetReadingCorrectionData(const ReadingCorrectionItem **array,
                                         size_t *size) const {}
diff --git a/src/data_manager/packed/packed_data_manager.cc b/src/data_manager/packed/packed_data_manager.cc
index 95c1bd7..7bd73e3 100644
--- a/src/data_manager/packed/packed_data_manager.cc
+++ b/src/data_manager/packed/packed_data_manager.cc
@@ -54,6 +54,7 @@
               "The dataset tag of the POS data.");
 
 using std::unique_ptr;
+using mozc::dictionary::SuffixToken;
 
 namespace mozc {
 namespace packed {
diff --git a/src/data_manager/packed/packed_data_manager.h b/src/data_manager/packed/packed_data_manager.h
index 07327d1..5026fcc 100644
--- a/src/data_manager/packed/packed_data_manager.h
+++ b/src/data_manager/packed/packed_data_manager.h
@@ -59,7 +59,7 @@
       size_t *bitarray_num_bytes, const char **bitarray_data,
       const BoundaryData **boundary_data) const;
   virtual void GetSystemDictionaryData(const char **data, int *size) const;
-  virtual void GetSuffixDictionaryData(const SuffixToken **data,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **data,
                                        size_t *size) const;
   virtual void GetReadingCorrectionData(const ReadingCorrectionItem **array,
                                         size_t *size) const;
diff --git a/src/data_manager/packed/system_dictionary_data_packer.cc b/src/data_manager/packed/system_dictionary_data_packer.cc
index ee9e55f..1c5345f 100644
--- a/src/data_manager/packed/system_dictionary_data_packer.cc
+++ b/src/data_manager/packed/system_dictionary_data_packer.cc
@@ -51,6 +51,8 @@
 #include "rewriter/usage_rewriter_data_structs.h"
 #endif  // NO_USAGE_REWRITER
 
+using mozc::dictionary::SuffixToken;
+
 namespace mozc {
 namespace packed {
 
diff --git a/src/data_manager/packed/system_dictionary_data_packer.h b/src/data_manager/packed/system_dictionary_data_packer.h
index 8c70007..6e2a9c2 100644
--- a/src/data_manager/packed/system_dictionary_data_packer.h
+++ b/src/data_manager/packed/system_dictionary_data_packer.h
@@ -70,7 +70,7 @@
       const BoundaryData *boundary_data,
       size_t boundary_data_count);
   void SetSuffixTokens(
-      const SuffixToken *suffix_tokens,
+      const dictionary::SuffixToken *suffix_tokens,
       size_t suffix_tokens_count);
   void SetReadingCorretions(
       const ReadingCorrectionItem *reading_corrections,
diff --git a/src/data_manager/testing/mock_data_manager.cc b/src/data_manager/testing/mock_data_manager.cc
index 91ab7cb..63b5e76 100644
--- a/src/data_manager/testing/mock_data_manager.cc
+++ b/src/data_manager/testing/mock_data_manager.cc
@@ -41,6 +41,8 @@
 #include "rewriter/usage_rewriter_data_structs.h"
 #endif  // NO_USAGE_REWRITER
 
+using mozc::dictionary::SuffixToken;
+
 namespace mozc {
 namespace testing {
 
diff --git a/src/data_manager/testing/mock_data_manager.h b/src/data_manager/testing/mock_data_manager.h
index f39fe62..30732b9 100644
--- a/src/data_manager/testing/mock_data_manager.h
+++ b/src/data_manager/testing/mock_data_manager.h
@@ -31,7 +31,6 @@
 #define MOZC_DATA_MANAGER_TESTING_MOCK_DATA_MANAGER_H_
 
 #include "base/port.h"
-#include "base/singleton.h"
 #include "data_manager/testing/mock_user_pos_manager.h"
 
 namespace mozc {
@@ -50,7 +49,7 @@
       size_t *bitarray_num_bytes, const char **bitarray_data,
       const BoundaryData **boundary_data) const;
   virtual void GetSystemDictionaryData(const char **data, int *size) const;
-  virtual void GetSuffixDictionaryData(const SuffixToken **data,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **data,
                                        size_t *size) const;
   virtual void GetReadingCorrectionData(const ReadingCorrectionItem **array,
                                         size_t *size) const;
diff --git a/src/data_manager/testing/mock_user_pos_manager.h b/src/data_manager/testing/mock_user_pos_manager.h
index 53bd927..136b18c 100644
--- a/src/data_manager/testing/mock_user_pos_manager.h
+++ b/src/data_manager/testing/mock_user_pos_manager.h
@@ -60,7 +60,7 @@
       size_t *bitarray_num_bytes, const char **bitarray_data,
       const BoundaryData **boundary_data) const {}
   virtual void GetSystemDictionaryData(const char **data, int *size) const {}
-  virtual void GetSuffixDictionaryData(const SuffixToken **tokens,
+  virtual void GetSuffixDictionaryData(const dictionary::SuffixToken **tokens,
                                        size_t *size) const {}
   virtual void GetReadingCorrectionData(const ReadingCorrectionItem **array,
                                         size_t *size) const {}
diff --git a/src/dictionary/gen_suffix_data.py b/src/dictionary/gen_suffix_data.py
index 8a6d893..796d932 100644
--- a/src/dictionary/gen_suffix_data.py
+++ b/src/dictionary/gen_suffix_data.py
@@ -55,7 +55,7 @@
   # Sort entries in the key-incremental order.
   result.sort(key=lambda e: e[1][0])
 
-  print 'const SuffixToken kSuffixTokens[] = {'
+  print 'const ::mozc::dictionary::SuffixToken kSuffixTokens[] = {'
   for (line, (key, value, lid, rid, cost)) in result:
     print '// "%s"' % line
     print '{ %s, %s, %d, %d, %d },' % (
diff --git a/src/dictionary/suffix_dictionary.cc b/src/dictionary/suffix_dictionary.cc
index 53ab416..289db54 100644
--- a/src/dictionary/suffix_dictionary.cc
+++ b/src/dictionary/suffix_dictionary.cc
@@ -31,7 +31,6 @@
 
 #include <algorithm>
 #include <cstring>
-#include <limits>
 #include <string>
 
 #include "base/iterator_adapter.h"
@@ -41,14 +40,7 @@
 #include "dictionary/suffix_dictionary_token.h"
 
 namespace mozc {
-
-SuffixDictionary::SuffixDictionary(const SuffixToken *suffix_tokens,
-                                   size_t suffix_tokens_size)
-    : suffix_tokens_(suffix_tokens),
-      suffix_tokens_size_(suffix_tokens_size) {}
-
-SuffixDictionary::~SuffixDictionary() {}
-
+namespace dictionary {
 namespace {
 
 struct SuffixTokenKeyAdapter : public AdapterBase<const char *> {
@@ -72,6 +64,13 @@
 
 }  // namespace
 
+SuffixDictionary::SuffixDictionary(const SuffixToken *suffix_tokens,
+                                   size_t suffix_tokens_size)
+    : suffix_tokens_(suffix_tokens),
+      suffix_tokens_size_(suffix_tokens_size) {}
+
+SuffixDictionary::~SuffixDictionary() {}
+
 bool SuffixDictionary::HasKey(StringPiece key) const {
   // SuffixDictionary::HasKey() is never called and unnecessary to
   // implement. To avoid accidental calls of this method, the method simply dies
@@ -140,4 +139,5 @@
 void SuffixDictionary::LookupExact(StringPiece key, Callback *callback) const {
 }
 
+}  // namespace dictionary
 }  // namespace mozc
diff --git a/src/dictionary/suffix_dictionary.h b/src/dictionary/suffix_dictionary.h
index 63b579b..206f6b7 100644
--- a/src/dictionary/suffix_dictionary.h
+++ b/src/dictionary/suffix_dictionary.h
@@ -35,6 +35,7 @@
 #include "dictionary/dictionary_interface.h"
 
 namespace mozc {
+namespace dictionary {
 
 struct SuffixToken;
 
@@ -77,6 +78,7 @@
   DISALLOW_COPY_AND_ASSIGN(SuffixDictionary);
 };
 
+}  // namespace dictionary
 }  // namespace mozc
 
 #endif  // MOZC_DICTIONARY_SUFFIX_DICTIONARY_H_
diff --git a/src/dictionary/suffix_dictionary_test.cc b/src/dictionary/suffix_dictionary_test.cc
index bbe9c3a..90b9169 100644
--- a/src/dictionary/suffix_dictionary_test.cc
+++ b/src/dictionary/suffix_dictionary_test.cc
@@ -37,9 +37,8 @@
 #include "dictionary/suffix_dictionary_token.h"
 #include "testing/base/public/gunit.h"
 
-using ::mozc::dictionary::CollectTokenCallback;
-
 namespace mozc {
+namespace dictionary {
 
 TEST(SuffixDictionaryTest, LookupPredictive) {
   // Test SuffixDictionary with mock data.
@@ -85,4 +84,5 @@
   }
 }
 
+}  // namespace dictionary
 }  // namespace mozc
diff --git a/src/dictionary/suffix_dictionary_token.h b/src/dictionary/suffix_dictionary_token.h
index ad16d15..db0801d 100644
--- a/src/dictionary/suffix_dictionary_token.h
+++ b/src/dictionary/suffix_dictionary_token.h
@@ -33,6 +33,7 @@
 #include "base/port.h"
 
 namespace mozc {
+namespace dictionary {
 
 // One entry of suffix dictionary.
 struct SuffixToken {
@@ -43,6 +44,7 @@
   int16  wcost;
 };
 
+}  // namespace dictionary
 }  // namespace mozc
 
 #endif  // MOZC_DICTIONARY_SUFFIX_DICTIONARY_TOKEN_H_
diff --git a/src/engine/engine.cc b/src/engine/engine.cc
index 008a4f2..6782b33 100644
--- a/src/engine/engine.cc
+++ b/src/engine/engine.cc
@@ -59,6 +59,8 @@
 #include "rewriter/rewriter_interface.h"
 
 using mozc::dictionary::DictionaryImpl;
+using mozc::dictionary::SuffixDictionary;
+using mozc::dictionary::SuffixToken;
 using mozc::dictionary::SuppressionDictionary;
 using mozc::dictionary::SystemDictionary;
 using mozc::dictionary::UserDictionary;
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 143bb8e..25baac6 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2083
+BUILD=2084
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.
diff --git a/src/prediction/dictionary_predictor_test.cc b/src/prediction/dictionary_predictor_test.cc
index 41d0f1c..160c6ae 100644
--- a/src/prediction/dictionary_predictor_test.cc
+++ b/src/prediction/dictionary_predictor_test.cc
@@ -38,6 +38,7 @@
 #include "base/flags.h"
 #include "base/logging.h"
 #include "base/port.h"
+#include "base/singleton.h"
 #include "base/system_util.h"
 #include "base/util.h"
 #include "composer/composer.h"
@@ -74,6 +75,8 @@
 #include "transliteration/transliteration.h"
 
 using ::testing::_;
+using mozc::dictionary::SuffixDictionary;
+using mozc::dictionary::SuffixToken;
 using mozc::dictionary::SuppressionDictionary;
 
 DECLARE_string(test_tmpdir);