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

Side by Side Diff: chrome/browser/prefs/session_startup_pref_unittest.cc

Issue 6596005: Fix compiling on gcc-4.6.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/prefs/session_startup_pref.h" 5 #include "chrome/browser/prefs/session_startup_pref.h"
6 #include "chrome/common/pref_names.h" 6 #include "chrome/common/pref_names.h"
7 #include "chrome/test/testing_pref_service.h" 7 #include "chrome/test/testing_pref_service.h"
8 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 url_pref_list2->Set(1, Value::CreateStringValue("chromium.org")); 42 url_pref_list2->Set(1, Value::CreateStringValue("chromium.org"));
43 url_pref_list2->Set(2, Value::CreateStringValue("chromium.org")); 43 url_pref_list2->Set(2, Value::CreateStringValue("chromium.org"));
44 pref_service_->SetManagedPref(prefs::kURLsToRestoreOnStartup, 44 pref_service_->SetManagedPref(prefs::kURLsToRestoreOnStartup,
45 url_pref_list2); 45 url_pref_list2);
46 46
47 SessionStartupPref result = 47 SessionStartupPref result =
48 SessionStartupPref::GetStartupPref(pref_service_.get()); 48 SessionStartupPref::GetStartupPref(pref_service_.get());
49 EXPECT_EQ(3u, result.urls.size()); 49 EXPECT_EQ(3u, result.urls.size());
50 50
51 SessionStartupPref override_test = 51 SessionStartupPref override_test =
52 SessionStartupPref::SessionStartupPref(SessionStartupPref::URLS); 52 SessionStartupPref(SessionStartupPref::URLS);
53 override_test.urls.push_back(GURL("dev.chromium.org")); 53 override_test.urls.push_back(GURL("dev.chromium.org"));
54 SessionStartupPref::SetStartupPref(pref_service_.get(), override_test); 54 SessionStartupPref::SetStartupPref(pref_service_.get(), override_test);
55 55
56 result = SessionStartupPref::GetStartupPref(pref_service_.get()); 56 result = SessionStartupPref::GetStartupPref(pref_service_.get());
57 EXPECT_EQ(3u, result.urls.size()); 57 EXPECT_EQ(3u, result.urls.size());
58 } 58 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/translate/translate_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698