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

Side by Side Diff: chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader_unittest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <algorithm> 5 #include <algorithm>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_column_reader.h" 9 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_column_reader.h"
10 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_constants.h" 10 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_constants.h"
11 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.h" 11 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_table_reader.h"
12 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.h" 12 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace { 15 namespace {
16 16
17 using picasa::PmpTestHelper; 17 using picasa::PmpTestHelper;
18 18
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 for (unsigned int i = 0; i < column_names.size(); i++) { 53 for (unsigned int i = 0; i < column_names.size(); i++) {
54 ASSERT_TRUE( 54 ASSERT_TRUE(
55 table_reader.AddColumn(column_names[i], column_field_types[i]) != NULL); 55 table_reader.AddColumn(column_names[i], column_field_types[i]) != NULL);
56 } 56 }
57 57
58 EXPECT_EQ(max_rows, table_reader.RowCount()); 58 EXPECT_EQ(max_rows, table_reader.RowCount());
59 } 59 }
60 60
61 } // namespace 61 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698