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

Side by Side Diff: chrome/browser/sync/profile_sync_service_unittest.cc

Issue 3058027: Add #include utf_string_conversions.h to all files that use ASCIIToWide and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <stack> 5 #include <stack>
6 #include <vector> 6 #include <vector>
7 7
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/bookmarks/bookmark_model.h" 15 #include "chrome/browser/bookmarks/bookmark_model.h"
15 #include "chrome/browser/chrome_thread.h" 16 #include "chrome/browser/chrome_thread.h"
16 #include "chrome/browser/profile.h" 17 #include "chrome/browser/profile.h"
17 #include "chrome/browser/sync/engine/syncapi.h" 18 #include "chrome/browser/sync/engine/syncapi.h"
18 #include "chrome/browser/sync/glue/change_processor.h" 19 #include "chrome/browser/sync/glue/change_processor.h"
19 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 20 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
20 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" 21 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
21 #include "chrome/browser/sync/glue/bookmark_model_associator.h" 22 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
22 #include "chrome/browser/sync/glue/data_type_controller.h" 23 #include "chrome/browser/sync/glue/data_type_controller.h"
23 #include "chrome/browser/sync/glue/model_associator.h" 24 #include "chrome/browser/sync/glue/model_associator.h"
(...skipping 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 ASSERT_TRUE(file_util::PathExists(sync_file1)); 1378 ASSERT_TRUE(file_util::PathExists(sync_file1));
1378 std::string file1text; 1379 std::string file1text;
1379 file_util::ReadFileToString(sync_file1, &file1text); 1380 file_util::ReadFileToString(sync_file1, &file1text);
1380 ASSERT_FALSE(file1text.compare(nonsense1) == 0); 1381 ASSERT_FALSE(file1text.compare(nonsense1) == 0);
1381 1382
1382 ASSERT_TRUE(file_util::PathExists(sync_file2)); 1383 ASSERT_TRUE(file_util::PathExists(sync_file2));
1383 std::string file2text; 1384 std::string file2text;
1384 file_util::ReadFileToString(sync_file2, &file2text); 1385 file_util::ReadFileToString(sync_file2, &file2text);
1385 ASSERT_FALSE(file2text.compare(nonsense2) == 0); 1386 ASSERT_FALSE(file2text.compare(nonsense2) == 0);
1386 } 1387 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/tab_contents/navigation_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698