Add unit test for Value > AEDesc conversion.

chrome/browser/ui/cocoa/applescript/tab_applescript.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h"
 
-#import <Carbon/Carbon.h>
-#import <Foundation/NSAppleEventDescriptor.h>
-
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/ui/cocoa/applescript/apple_event_util.h"
 #include "chrome/browser/ui/cocoa/applescript/error_applescript.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "googleurl/src/gurl.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::RenderViewHost;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
-NSAppleEventDescriptor* valueToDescriptor(const base::Value* value) {
-  NSAppleEventDescriptor* descriptor = nil;
-  switch (value->GetType()) {
-    case base::Value::TYPE_NULL:
-      descriptor = [NSAppleEventDescriptor
-          descriptorWithTypeCode:cMissingValue];
-      break;
-    case base::Value::TYPE_BOOLEAN: {
-      bool bool_value;
-      value->GetAsBoolean(&bool_value);
-      descriptor = [NSAppleEventDescriptor descriptorWithBoolean:bool_value];
-      break;
-    }
-    case base::Value::TYPE_INTEGER: {
-      int int_value;
-      value->GetAsInteger(&int_value);
-      descriptor = [NSAppleEventDescriptor descriptorWithInt32:int_value];
-      break;
-    }
-    case base::Value::TYPE_DOUBLE: {
-      double double_value;
-      value->GetAsDouble(&double_value);
-      descriptor = [NSAppleEventDescriptor
-          descriptorWithDescriptorType:typeIEEE64BitFloatingPoint
-                                 bytes:&double_value
-                                length:sizeof(double_value)];
-      break;
-    }
-    case base::Value::TYPE_STRING: {
-      std::string string_value;
-      value->GetAsString(&string_value);
-      descriptor = [NSAppleEventDescriptor descriptorWithString:
-          base::SysUTF8ToNSString(string_value)];
-      break;
-    }
-    case base::Value::TYPE_BINARY:
-      NOTREACHED();
-      break;
-    case base::Value::TYPE_DICTIONARY: {
-      const base::DictionaryValue* dictionary_value =
-          static_cast<const base::DictionaryValue*>(value);
-      descriptor = [NSAppleEventDescriptor recordDescriptor];
-      NSAppleEventDescriptor* userRecord = [NSAppleEventDescriptor
-          listDescriptor];
-      for (DictionaryValue::key_iterator iter(dictionary_value->begin_keys());
-           iter != dictionary_value->end_keys(); ++iter) {
-        const base::Value* item;
-        if (dictionary_value->Get(*iter, &item)) {
-          [userRecord insertDescriptor:[NSAppleEventDescriptor
-              descriptorWithString:base::SysUTF8ToNSString(*iter)] atIndex:0];
-          [userRecord insertDescriptor:valueToDescriptor(item) atIndex:0];
-        }
-      }
-      // Description of what keyASUserRecordFields does.
-      // http://www.mail-archive.com/cocoa-dev%40lists.apple.com/msg40149.html
-      [descriptor setDescriptor:userRecord forKeyword:keyASUserRecordFields];
-      break;
-    }
-    case base::Value::TYPE_LIST: {
-      const base::ListValue* list_value;
-      value->GetAsList(&list_value);
-      descriptor = [NSAppleEventDescriptor listDescriptor];
-      for (unsigned i = 0; i < list_value->GetSize(); ++i) {
-        const base::Value* item;
-        list_value->Get(i, &item);
-        [descriptor insertDescriptor:valueToDescriptor(item) atIndex:0];
-      }
-      break;
-    }
-  }
-  return descriptor;
-}
-
 void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id,
                                   const base::Value* result_value) {
-  NSAppleEventDescriptor* result_descriptor = valueToDescriptor(result_value);
+  NSAppleEventDescriptor* result_descriptor =
+      ValueToAppleEventDescriptor(result_value);
 
   NSAppleEventManager* manager = [NSAppleEventManager sharedAppleEventManager];
   NSAppleEventDescriptor* reply_event =
       [manager replyAppleEventForSuspensionID:suspension_id];
   [reply_event setParamDescriptor:result_descriptor
                        forKeyword:keyDirectObject];
   [manager resumeWithSuspensionID:suspension_id];
 }
 
 }  // namespace
@@ skipping 281 matching lines @@
   string16 script = base::SysNSStringToUTF16(
       [[command evaluatedArguments] objectForKey:@"javascript"]);
   view->ExecuteJavascriptInWebFrameCallbackResult(string16(),  // frame_xpath
                                                   script,
                                                   callback);
 
   return nil;
 }
 
 @end