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

Side by Side Diff: chrome/browser/browser_encoding_browsertest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/character_encoding.h" 9 #include "chrome/browser/character_encoding.h"
9 #include "chrome/browser/net/url_request_mock_util.h" 10 #include "chrome/browser/net/url_request_mock_util.h"
10 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 13 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/download_manager.h" 19 #include "content/public/browser/download_manager.h"
20 #include "content/public/browser/navigation_controller.h" 20 #include "content/public/browser/navigation_controller.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 EXPECT_EQ(kTestDatas[i].expected_encoding, web_contents->GetEncoding()); 320 EXPECT_EQ(kTestDatas[i].expected_encoding, web_contents->GetEncoding());
321 321
322 // Dump the page, the content of dump page should be equal with our expect 322 // Dump the page, the content of dump page should be equal with our expect
323 // result file. 323 // result file.
324 FilePath expected_result_file_name = 324 FilePath expected_result_file_name =
325 FilePath().AppendASCII(kAutoDetectDir).AppendASCII(kExpectedResultDir). 325 FilePath().AppendASCII(kAutoDetectDir).AppendASCII(kExpectedResultDir).
326 AppendASCII(kTestDatas[i].expected_result); 326 AppendASCII(kTestDatas[i].expected_result);
327 SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name); 327 SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
328 } 328 }
329 } 329 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698