Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <map> 5 #include <map>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/guid.h" 9 #include "base/guid.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "google_apis/gaia/google_service_auth_error.h" 47 #include "google_apis/gaia/google_service_auth_error.h"
48 #include "grit/webkit_resources.h" 48 #include "grit/webkit_resources.h"
49 #include "testing/gmock/include/gmock/gmock.h" 49 #include "testing/gmock/include/gmock/gmock.h"
50 #include "testing/gtest/include/gtest/gtest.h" 50 #include "testing/gtest/include/gtest/gtest.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 52
53 #if defined(OS_WIN) 53 #if defined(OS_WIN)
54 #include "ui/base/win/scoped_ole_initializer.h" 54 #include "ui/base/win/scoped_ole_initializer.h"
55 #endif 55 #endif
56 56
57 using base::ASCIIToUTF16;
58 using base::UTF8ToUTF16;
59
57 namespace autofill { 60 namespace autofill {
58 61
59 namespace { 62 namespace {
60 63
61 using testing::_; 64 using testing::_;
62 65
63 const char kFakeEmail[] = "user@chromium.org"; 66 const char kFakeEmail[] = "user@chromium.org";
64 const char kFakeFingerprintEncoded[] = "CgVaAwiACA=="; 67 const char kFakeFingerprintEncoded[] = "CgVaAwiACA==";
65 const char kEditedBillingAddress[] = "123 edited billing address"; 68 const char kEditedBillingAddress[] = "123 edited billing address";
66 const char* kFieldsFromPage[] = 69 const char* kFieldsFromPage[] =
(...skipping 2693 matching lines...) Expand 10 before | Expand all | Expand 10 after
2760 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 2763 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
2761 for (size_t i = 0; i < arraysize(kSupportedCardIdrs); ++i) { 2764 for (size_t i = 0; i < arraysize(kSupportedCardIdrs); ++i) {
2762 SCOPED_TRACE(base::IntToString(i)); 2765 SCOPED_TRACE(base::IntToString(i));
2763 gfx::Image supported_card_icon = rb.GetImageNamed(kSupportedCardIdrs[i]); 2766 gfx::Image supported_card_icon = rb.GetImageNamed(kSupportedCardIdrs[i]);
2764 EXPECT_GE(placeholder_icon.Width(), supported_card_icon.Width()); 2767 EXPECT_GE(placeholder_icon.Width(), supported_card_icon.Width());
2765 EXPECT_GE(placeholder_icon.Height(), supported_card_icon.Height()); 2768 EXPECT_GE(placeholder_icon.Height(), supported_card_icon.Height());
2766 } 2769 }
2767 } 2770 }
2768 2771
2769 } // namespace autofill 2772 } // namespace autofill
OLDNEW
« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | chrome/browser/ui/autofill/autofill_dialog_models.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698