Move the json-related files into a separate json directory. This hopefully al...

net/base/strict_transport_security_state.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/strict_transport_security_state.h"
 
-#include "base/json_reader.h"
-#include "base/json_writer.h"
+#include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/sha2.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/base64.h"
 #include "net/base/dns_util.h"
 
@@ skipping 202 matching lines @@
   DictionaryValue toplevel;
   for (std::map<std::string, State>::const_iterator
        i = enabled_hosts_.begin(); i != enabled_hosts_.end(); ++i) {
     DictionaryValue* state = new DictionaryValue;
     state->SetBoolean(L"include_subdomains", i->second.include_subdomains);
     state->SetReal(L"expiry", i->second.expiry.ToDoubleT());
 
     toplevel.Set(HashedDomainToExternalString(i->first), state);
   }
 
-  JSONWriter::Write(&toplevel, true /* pretty print */, output);
+  base::JSONWriter::Write(&toplevel, true /* pretty print */, output);
   return true;
 }
 
 bool StrictTransportSecurityState::Deserialise(const std::string& input) {
   AutoLock lock(lock_);
 
   enabled_hosts_.clear();
 
   scoped_ptr<Value> value(
-      JSONReader::Read(input, false /* do not allow trailing commas */));
+      base::JSONReader::Read(input, false /* do not allow trailing commas */));
   if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY))
     return false;
 
   DictionaryValue* dict_value = reinterpret_cast<DictionaryValue*>(value.get());
   const base::Time current_time(base::Time::Now());
 
   for (DictionaryValue::key_iterator
        i = dict_value->begin_keys(); i != dict_value->end_keys(); ++i) {
     DictionaryValue* state;
     if (!dict_value->GetDictionary(*i, &state))
@@ skipping 57 matching lines @@
     if (new_host[i + 1] == '-' ||
         new_host[i + label_length] == '-') {
       return std::string();
     }
   }
 
   return new_host;
 }
 
 }  // namespace