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

Side by Side Diff: chrome/browser/profile_resetter/profile_resetter_unittest.cc

Issue 24930003: Migrate startup URLs pref. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename remaining old pref value. Created 7 years, 2 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/profile_resetter/profile_resetter.h" 5 #include "chrome/browser/profile_resetter/profile_resetter.h"
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/content_settings/host_content_settings_map.h" 10 #include "chrome/browser/content_settings/host_content_settings_map.h"
(...skipping 24 matching lines...) Expand all
35 namespace { 35 namespace {
36 36
37 const char kDistributionConfig[] = "{" 37 const char kDistributionConfig[] = "{"
38 " \"homepage\" : \"http://www.foo.com\"," 38 " \"homepage\" : \"http://www.foo.com\","
39 " \"homepage_is_newtabpage\" : false," 39 " \"homepage_is_newtabpage\" : false,"
40 " \"browser\" : {" 40 " \"browser\" : {"
41 " \"show_home_button\" : true" 41 " \"show_home_button\" : true"
42 " }," 42 " },"
43 " \"session\" : {" 43 " \"session\" : {"
44 " \"restore_on_startup\" : 4," 44 " \"restore_on_startup\" : 4,"
45 " \"urls_to_restore_on_startup\" : [\"http://goo.gl\", \"http://foo.de\"]" 45 " \"startup_urls\" : [\"http://goo.gl\", \"http://foo.de\"]"
46 " }," 46 " },"
47 " \"search_provider_overrides\" : [" 47 " \"search_provider_overrides\" : ["
48 " {" 48 " {"
49 " \"name\" : \"first\"," 49 " \"name\" : \"first\","
50 " \"keyword\" : \"firstkey\"," 50 " \"keyword\" : \"firstkey\","
51 " \"search_url\" : \"http://www.foo.com/s?q={searchTerms}\"," 51 " \"search_url\" : \"http://www.foo.com/s?q={searchTerms}\","
52 " \"favicon_url\" : \"http://www.foo.com/favicon.ico\"," 52 " \"favicon_url\" : \"http://www.foo.com/favicon.ico\","
53 " \"suggest_url\" : \"http://www.foo.com/s?q={searchTerms}\"," 53 " \"suggest_url\" : \"http://www.foo.com/s?q={searchTerms}\","
54 " \"encoding\" : \"UTF-8\"," 54 " \"encoding\" : \"UTF-8\","
55 " \"id\" : 1001" 55 " \"id\" : 1001"
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 ASSERT_TRUE(dict->GetString("key", &value)); 842 ASSERT_TRUE(dict->GetString("key", &value));
843 if (value == "Extensions") { 843 if (value == "Extensions") {
844 string16 extensions; 844 string16 extensions;
845 EXPECT_TRUE(dict->GetString("value", &extensions)); 845 EXPECT_TRUE(dict->GetString("value", &extensions));
846 EXPECT_EQ(WideToUTF16(L"Tiësto"), extensions); 846 EXPECT_EQ(WideToUTF16(L"Tiësto"), extensions);
847 } 847 }
848 } 848 }
849 } 849 }
850 850
851 } // namespace 851 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/prefs/session_startup_pref.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698