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

chrome/browser/extensions/extension_toolstrip_api.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 "chrome/browser/extensions/extension_toolstrip_api.h"
 
-#include "base/json_writer.h"
+#include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_shelf_model.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/profile.h"
 
 namespace extension_toolstrip_api_events {
 const char kOnToolstripExpanded[] = "toolstrip.onExpanded.%d";
@@ skipping 106 matching lines @@
   return true;
 }
 
 // static
 void ToolstripEventRouter::DispatchEvent(Profile *profile,
                                          int routing_id,
                                          const char *event_name,
                                          const Value& json) {
   if (profile->GetExtensionMessageService()) {
     std::string json_args;
-    JSONWriter::Write(&json, false, &json_args);
+    base::JSONWriter::Write(&json, false, &json_args);
     std::string full_event_name = StringPrintf(event_name, routing_id);
     profile->GetExtensionMessageService()->
         DispatchEventToRenderers(full_event_name, json_args);
   }
 }
 
 // static
 void ToolstripEventRouter::OnToolstripExpanded(Profile* profile,
                                                int routing_id,
                                                const GURL &url,
@@ skipping 11 matching lines @@
 void ToolstripEventRouter::OnToolstripCollapsed(Profile* profile,
                                                 int routing_id,
                                                 const GURL &url) {
   ListValue args;
   DictionaryValue* obj = new DictionaryValue();
   if (!url.is_empty())
     obj->SetString(keys::kUrlKey, url.spec());
   args.Append(obj);
   DispatchEvent(profile, routing_id, events::kOnToolstripCollapsed, args);
 }