[Android] Split the address parser from AddressDetector for WebView use.

content/renderer/android/address_detector.h

Index: content/renderer/android/address_detector.h
diff --git a/content/renderer/android/address_detector.h b/content/renderer/android/address_detector.h
index af05191ca505681453125ee8238aac866494fe75..a9d0e23a71789b2668fb4460f28d09305e678cc4 100644
--- a/content/renderer/android/address_detector.h
+++ b/content/renderer/android/address_detector.h
@@ -6,13 +6,9 @@
 #define CONTENT_RENDERER_ANDROID_ADDRESS_DETECTOR_H_
 #pragma once
 
-#include <vector>
-
 #include "base/compiler_specific.h"
-#include "base/string_tokenizer.h"
 #include "content/renderer/android/content_detector.h"
-
-class AddressDetectorTest;
+#include "googleurl/src/gurl.h"
 
 namespace content {
 
@@ -23,8 +19,6 @@ class AddressDetector : public ContentDetector {
   virtual ~AddressDetector();
 
  private:
-  friend class ::AddressDetectorTest;
-
   // Implementation of ContentDetector.
   virtual bool FindContent(const string16::const_iterator& begin,
                            const string16::const_iterator& end,
@@ -36,64 +30,6 @@ class AddressDetector : public ContentDetector {
 
   std::string GetContentText(const string16& text);
 
-  // Internal structs and classes. Required to be visible by the unit tests.
-  struct Word {
-    string16::const_iterator begin;
-    string16::const_iterator end;
-
-    Word() {}
-    Word(const string16::const_iterator& begin,
-         const string16::const_iterator& end);
-  };
-
-  class HouseNumberParser {
-   public:
-    HouseNumberParser() {}
-
-    bool Parse(const string16::const_iterator& begin,
-               const string16::const_iterator& end,
-               Word* word);
-
-   private:
-    static inline bool IsPreDelimiter(char16 character);
-    static inline bool IsPostDelimiter(char16 character);
-    inline void RestartOnNextDelimiter();
-
-    inline bool CheckFinished(Word* word) const;
-    inline void AcceptChars(size_t num_chars);
-    inline void SkipChars(size_t num_chars);
-    inline void ResetState();
-
-    // Iterators to the beginning, current position and ending of the string
-    // being currently parsed.
-    string16::const_iterator begin_;
-    string16::const_iterator it_;
-    string16::const_iterator end_;
-
-    // Number of digits found in the current result candidate.
-    size_t num_digits_;
-
-    // Number of characters previous to the current iterator that belong
-    // to the current result candidate.
-    size_t result_chars_;
-
-    DISALLOW_COPY_AND_ASSIGN(HouseNumberParser);
-  };
-
-  typedef std::vector<Word> WordList;
-  typedef StringTokenizerT<string16, string16::const_iterator>
-      String16Tokenizer;
-
-  static bool FindStateStartingInWord(WordList* words,
-                                      size_t state_first_word,
-                                      size_t* state_last_word,
-                                      String16Tokenizer* tokenizer,
-                                      size_t* state_index);
-
-  static bool IsValidLocationName(const Word& word);
-  static bool IsZipValid(const Word& word, size_t state_index);
-  static bool IsZipValidForState(const Word& word, size_t state_index);
-
   DISALLOW_COPY_AND_ASSIGN(AddressDetector);
 };