Remove wstring from l10n_util. Part 3....

chrome/browser/notifications/notification_exceptions_table_model_unittest.cc

 // 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.
 
 #include "chrome/browser/notifications/notification_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"

[viettrungluu, 2010/12/29 19:04:15]

Could you mark this with a "TODO: remove when conversions removed" or similar?

[Avi (use Gerrit), 2010/12/29 19:40:49]

Done.

 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class NotificationExceptionsTableModelTest : public RenderViewHostTestHarness {
  public:
   NotificationExceptionsTableModelTest()
      : ui_thread_(BrowserThread::UI, MessageLoop::current()) {
@@ skipping 50 matching lines @@
   EXPECT_EQ(0u, service_->GetAllowedOrigins().size());
   EXPECT_EQ(0u, service_->GetBlockedOrigins().size());
 }
 
 TEST_F(NotificationExceptionsTableModelTest, AlphabeticalOrder) {
   FillData();
   EXPECT_EQ(5, model_->RowCount());
 
   EXPECT_EQ(L"allowed.com",
             model_->GetText(0, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)),
             model_->GetText(0, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"denied.com",
             model_->GetText(1, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),
             model_->GetText(1, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"denied2.com",
             model_->GetText(2, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),
             model_->GetText(2, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"e-allowed2.com",
             model_->GetText(3, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)),
             model_->GetText(3, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"f-denied3.com",
             model_->GetText(4, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),
             model_->GetText(4, IDS_EXCEPTIONS_ACTION_HEADER));
 }
 
 TEST_F(NotificationExceptionsTableModelTest, RemoveRows) {
   FillData();
   EXPECT_EQ(5, model_->RowCount());
 
   {
     RemoveRowsTableModel::Rows rows;
     rows.insert(0);  // allowed.com
     rows.insert(3);  // e-allowed2.com
     model_->RemoveRows(rows);
   }
   EXPECT_EQ(3, model_->RowCount());
   EXPECT_EQ(0u, service_->GetAllowedOrigins().size());
   EXPECT_EQ(3u, service_->GetBlockedOrigins().size());
 
   {
     RemoveRowsTableModel::Rows rows;
     rows.insert(0);
     rows.insert(1);
     rows.insert(2);
     model_->RemoveRows(rows);
   }
   EXPECT_EQ(0, model_->RowCount());
   EXPECT_EQ(0u, service_->GetAllowedOrigins().size());
   EXPECT_EQ(0u, service_->GetBlockedOrigins().size());
 }