Update to Chromium revision 241258.

- Update tracing implementation to use the new file-based approach (issue #1157).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1549 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/browser/javascript_dialog_mac.mm

@@ -68,7 +68,7 @@
     return;
 
   bool success = returnCode == NSAlertFirstButtonReturn;
-  string16 input;
+  base::string16 input;
   if (textField_)
     input = base::SysNSStringToUTF16([textField_ stringValue]);
 
@@ -88,9 +88,9 @@
 CefJavaScriptDialog::CefJavaScriptDialog(
     CefJavaScriptDialogManager* creator,
     content::JavaScriptMessageType message_type,
-    const string16& display_url,
-    const string16& message_text,
-    const string16& default_prompt_text,
+    const base::string16& display_url,
+    const base::string16& message_text,
+    const base::string16& default_prompt_text,
     const content::JavaScriptDialogManager::DialogClosedCallback& callback)
     : creator_(creator),
       callback_(callback) {
@@ -113,7 +113,7 @@ CefJavaScriptDialog::CefJavaScriptDialog(
   [alert setDelegate:helper_];
   [alert setInformativeText:base::SysUTF16ToNSString(message_text)];
 
-  string16 label;
+  base::string16 label;
   switch (message_type) {
     case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
       label = ASCIIToUTF16("JavaScript Alert");