Extension API Renaming/Consistency changes

chrome/browser/extensions/extension_uitest.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 "base/command_line.h"
 #include "base/gfx/rect.h"
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
@@ skipping 230 matching lines @@
       EXPECT_TRUE(tab_dict.SetInteger(
           extension_tabs_module_constants::kWindowIdKey, 1));
       EXPECT_TRUE(tab_dict.SetBoolean(
           extension_tabs_module_constants::kSelectedKey, true));
       EXPECT_TRUE(tab_dict.SetString(
           extension_tabs_module_constants::kUrlKey, "http://www.google.com"));
 
       std::string tab_json;
       JSONWriter::Write(&tab_dict, false, &tab_json);
 
-      EXPECT_TRUE(response_dict.SetString(keys::kAutomationResponseKey, tab_json));
+      EXPECT_TRUE(response_dict.SetString(keys::kAutomationResponseKey,
+          tab_json));
 
       std::string response_json;
       JSONWriter::Write(&response_dict, false, &response_json);
 
       tab_->HandleMessageFromExternalHost(
           response_json,
           keys::kAutomationOrigin,
           keys::kAutomationResponseTarget);
     } else if (messages_received_ == 2) {
       EXPECT_EQ(function_name, "tabs.remove");
@@ skipping 66 matching lines @@
  protected:
   // Process a message received from the test extension.
   virtual void HandleMessageFromChrome();
 
   // Fire an event of the given name to the test extension.
   void FireEvent(const char* event_name);
 };
 
 const char* BrowserEventAutomationProxy::events_[] = {
   // Window events.
-  "[\"windows.onCreated\", \"[42]\"]",
-  
+  "[\"windows.onCreated\", \"[{'id':42}]\"]",
+
   "[\"windows.onRemoved\", \"[42]\"]",
-  
+
   "[\"windows.onFocusChanged\", \"[42]\"]",
-  
+
   // Tab events.
   "[\"tabs.onCreated\", \"[{'id\':42,'index':1,'windowId':1,"
       "'selected':true,'url':'http://www.google.com'}]\"]",
-  
+
   "[\"tabs.onUpdated\", \"[42, {'status': 'complete',"
       "'url':'http://www.google.com'}]\"]",
-  
+
   "[\"tabs.onMoved\", \"[42, {'windowId':1,'fromIndex':1,'toIndex':2}]\"]",
-  
+
   "[\"tabs.onSelectionChanged\", \"[42, {'windowId':1}]\"]",
-  
+
   "[\"tabs.onAttached\", \"[42, {'newWindowId':1,'newPosition':1}]\"]",
-  
+
   "[\"tabs.onDetached\", \"[43, {'oldWindowId':1,'oldPosition':1}]\"]",
-  
+
   "[\"tabs.onRemoved\", \"[43]\"]",
 
   // Bookmark events.
-  "[\"bookmarks.onAdded\", \"['42', {'id':'42','title':'foo',}]\"]",
-  
+  "[\"bookmarks.onCreated\", \"['42', {'id':'42','title':'foo',}]\"]",
+
   "[\"bookmarks.onRemoved\", \"['42', {'parentId':'2','index':1}]\"]",
-  
+
   "[\"bookmarks.onChanged\", \"['42', {'title':'foo'}]\"]",
-  
+
   "[\"bookmarks.onMoved\", \"['42', {'parentId':'2','index':1,"
       "'oldParentId':'3','oldIndex':2}]\"]",
-  
-  "[\"bookmarks.onChildrenReordered\", \"['32', ['1', '2', '3']]\"]"
+
+  "[\"bookmarks.onChildrenReordered\", \"['32', "
+      "{'childIds':['1', '2', '3']}]\"]"
 };
 
 void BrowserEventAutomationProxy::HandleMessageFromChrome() {
   namespace keys = extension_automation_constants;
   ASSERT_TRUE(tab_ != NULL);
 
   std::string message(message());
   std::string origin(origin());
   std::string target(target());
 
@@ skipping 113 matching lines @@
             proxy->event_count_.size());
   for (std::map<std::string, int>::iterator i = proxy->event_count_.begin();
       i != proxy->event_count_.end(); ++i) {
     const std::pair<std::string, int>& value = *i;
     ASSERT_EQ(1, value.second);
   }
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace