3 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc
index 5aeb8a9..2c53a29 100644
--- a/chrome/browser/chromeos/external_protocol_dialog.cc
+++ b/chrome/browser/chromeos/external_protocol_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -82,7 +82,7 @@ views::View* ExternalProtocolDialog::GetContentsView() {
 ExternalProtocolDialog::ExternalProtocolDialog(TabContents* tab_contents,
                                                const GURL& url)
     : creation_time_(base::TimeTicks::Now()),
-      scheme_(UTF8ToWide(url.scheme())) {
+      scheme_(url.scheme()) {
   const int kMaxUrlWithoutSchemeSize = 256;
   std::wstring elided_url_without_scheme;
   ElideString(ASCIIToWide(url.possibly_invalid_spec()),
diff --git a/chrome/browser/chromeos/external_protocol_dialog.h b/chrome/browser/chromeos/external_protocol_dialog.h
index dc598de..84f7955 100644
--- a/chrome/browser/chromeos/external_protocol_dialog.h
+++ b/chrome/browser/chromeos/external_protocol_dialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -44,7 +44,7 @@ class ExternalProtocolDialog : public views::DialogDelegate {
   base::TimeTicks creation_time_;
 
   // The scheme of the url.
-  std::wstring scheme_;
+  std::string scheme_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProtocolDialog);
 };
diff --git a/chrome/browser/chromeos/login/user_image_downloader.cc b/chrome/browser/chromeos/login/user_image_downloader.cc
index 490ca77..c5b40bb 100644
--- a/chrome/browser/chromeos/login/user_image_downloader.cc
+++ b/chrome/browser/chromeos/login/user_image_downloader.cc
@@ -109,11 +109,11 @@ bool UserImageDownloader::GetImageURL(const std::string& json_data,
   DictionaryValue* root_dictionary =
       static_cast<DictionaryValue*>(root.get());
   DictionaryValue* feed_dictionary = NULL;
-  if (!root_dictionary->GetDictionary(L"feed", &feed_dictionary))
+  if (!root_dictionary->GetDictionary("feed", &feed_dictionary))
     return false;
 
   ListValue* entry_list = NULL;
-  if (!feed_dictionary->GetList(L"entry", &entry_list))
+  if (!feed_dictionary->GetList("entry", &entry_list))
     return false;
 
   return GetImageURLFromEntries(entry_list, image_url);
@@ -129,7 +129,7 @@ bool UserImageDownloader::GetImageURLFromEntries(ListValue* entry_list,
       continue;
 
     ListValue* email_list = NULL;
-    if (!entry_dictionary->GetList(L"gd$email", &email_list))
+    if (!entry_dictionary->GetList("gd$email", &email_list))
       continue;
 
     // Match entry email address to understand that this is user's entry.
@@ -137,7 +137,7 @@ bool UserImageDownloader::GetImageURLFromEntries(ListValue* entry_list,
       continue;
 
     ListValue* link_list = NULL;
-    if (!entry_dictionary->GetList(L"link", &link_list))
+    if (!entry_dictionary->GetList("link", &link_list))
       continue;
 
     if (GetImageURLFromLinks(link_list, image_url))