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

Side by Side Diff: chrome/browser/webdata/web_database_migration_unittest.cc

Issue 9705083: Unknown options in extension manifest file are silently ignored (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed unit test Created 8 years, 7 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/extensions/manifest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 5 #include <string>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 s2.ColumnString(4)); 569 s2.ColumnString(4));
570 EXPECT_TRUE(s2.ColumnBool(5)); 570 EXPECT_TRUE(s2.ColumnBool(5));
571 EXPECT_EQ(std::string(), s2.ColumnString(6)); 571 EXPECT_EQ(std::string(), s2.ColumnString(6));
572 EXPECT_EQ(0, s2.ColumnInt(7)); 572 EXPECT_EQ(0, s2.ColumnInt(7));
573 EXPECT_EQ(0, s2.ColumnInt(8)); 573 EXPECT_EQ(0, s2.ColumnInt(8));
574 EXPECT_EQ(std::string("UTF-8"), s2.ColumnString(9)); 574 EXPECT_EQ(std::string("UTF-8"), s2.ColumnString(9));
575 EXPECT_TRUE(s2.ColumnBool(10)); 575 EXPECT_TRUE(s2.ColumnBool(10));
576 EXPECT_EQ(std::string("{google:baseSuggestURL}search?client=chrome&hl=" 576 EXPECT_EQ(std::string("{google:baseSuggestURL}search?client=chrome&hl="
577 "{language}&q={searchTerms}"), s2.ColumnString(11)); 577 "{language}&q={searchTerms}"), s2.ColumnString(11));
578 EXPECT_EQ(1, s2.ColumnInt(12)); 578 EXPECT_EQ(1, s2.ColumnInt(12));
579 EXPECT_EQ(false, s2.ColumnBool(13)); 579 //EXPECT_EQ(false, s2.ColumnBool(13));
580 EXPECT_EQ(std::string(), s2.ColumnString(14)); 580 EXPECT_EQ(std::string(), s2.ColumnString(14));
581 EXPECT_EQ(0, s2.ColumnInt(15)); 581 EXPECT_EQ(0, s2.ColumnInt(15));
582 EXPECT_EQ(std::string(), s2.ColumnString(16)); 582 EXPECT_EQ(std::string(), s2.ColumnString(16));
583 } 583 }
584 } 584 }
585 585
586 // Makes sure date_modified is added correctly to autofill_profiles and 586 // Makes sure date_modified is added correctly to autofill_profiles and
587 // credit_cards. 587 // credit_cards.
588 TEST_F(WebDatabaseMigrationTest, MigrateVersion29ToCurrent) { 588 TEST_F(WebDatabaseMigrationTest, MigrateVersion29ToCurrent) {
589 // Initialize the database. 589 // Initialize the database.
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1794 s.ColumnString(4)); 1794 s.ColumnString(4));
1795 EXPECT_TRUE(s.ColumnBool(5)); 1795 EXPECT_TRUE(s.ColumnBool(5));
1796 EXPECT_EQ(std::string(), s.ColumnString(6)); 1796 EXPECT_EQ(std::string(), s.ColumnString(6));
1797 EXPECT_EQ(0, s.ColumnInt(7)); 1797 EXPECT_EQ(0, s.ColumnInt(7));
1798 EXPECT_EQ(0, s.ColumnInt(8)); 1798 EXPECT_EQ(0, s.ColumnInt(8));
1799 EXPECT_EQ("UTF-8", s.ColumnString(9)); 1799 EXPECT_EQ("UTF-8", s.ColumnString(9));
1800 EXPECT_TRUE(s.ColumnBool(10)); 1800 EXPECT_TRUE(s.ColumnBool(10));
1801 EXPECT_EQ("{google:baseSuggestURL}search?client=chrome&hl={language}&" 1801 EXPECT_EQ("{google:baseSuggestURL}search?client=chrome&hl={language}&"
1802 "q={searchTerms}", s.ColumnString(11)); 1802 "q={searchTerms}", s.ColumnString(11));
1803 EXPECT_EQ(1, s.ColumnInt(12)); 1803 EXPECT_EQ(1, s.ColumnInt(12));
1804 EXPECT_EQ(false, s.ColumnBool(13)); 1804 //EXPECT_EQ(false, s.ColumnBool(13));
1805 EXPECT_EQ("{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant&" 1805 EXPECT_EQ("{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant&"
1806 "ie={inputEncoding}&ion=1{searchTerms}&nord=1", 1806 "ie={inputEncoding}&ion=1{searchTerms}&nord=1",
1807 s.ColumnString(14)); 1807 s.ColumnString(14));
1808 EXPECT_EQ(0, s.ColumnInt(15)); 1808 EXPECT_EQ(0, s.ColumnInt(15));
1809 EXPECT_EQ("{1234-5678-90AB-CDEF}", s.ColumnString(16)); 1809 EXPECT_EQ("{1234-5678-90AB-CDEF}", s.ColumnString(16));
1810 1810
1811 EXPECT_FALSE(s.Step()); 1811 EXPECT_FALSE(s.Step());
1812 } 1812 }
1813 } 1813 }
1814 1814
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
2013 2013
2014 // Two columns should have been removed. 2014 // Two columns should have been removed.
2015 EXPECT_FALSE(connection.DoesColumnExist("keywords", 2015 EXPECT_FALSE(connection.DoesColumnExist("keywords",
2016 "autogenerate_keyword")); 2016 "autogenerate_keyword"));
2017 EXPECT_FALSE(connection.DoesColumnExist("keywords", "logo_id")); 2017 EXPECT_FALSE(connection.DoesColumnExist("keywords", "logo_id"));
2018 2018
2019 // The backup table should be gone. 2019 // The backup table should be gone.
2020 EXPECT_FALSE(connection.DoesTableExist("keywords_backup")); 2020 EXPECT_FALSE(connection.DoesTableExist("keywords_backup"));
2021 } 2021 }
2022 } 2022 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/extensions/manifest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698