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

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

Issue 13191007: Pass app_locale directly to AutofillTable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Chrome frame tests fix Created 7 years, 8 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "chrome/browser/webdata/web_apps_table.h" 10 #include "chrome/browser/webdata/web_apps_table.h"
(...skipping 10 matching lines...) Expand all
21 virtual ~WebAppsTableTest() {} 21 virtual ~WebAppsTableTest() {}
22 22
23 protected: 23 protected:
24 virtual void SetUp() { 24 virtual void SetUp() {
25 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 25 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
26 file_ = temp_dir_.path().AppendASCII("TestWebDatabase"); 26 file_ = temp_dir_.path().AppendASCII("TestWebDatabase");
27 27
28 table_.reset(new WebAppsTable); 28 table_.reset(new WebAppsTable);
29 db_.reset(new WebDatabase); 29 db_.reset(new WebDatabase);
30 db_->AddTable(table_.get()); 30 db_->AddTable(table_.get());
31 ASSERT_EQ(sql::INIT_OK, db_->Init(file_, std::string())); 31 ASSERT_EQ(sql::INIT_OK, db_->Init(file_));
32 } 32 }
33 33
34 base::FilePath file_; 34 base::FilePath file_;
35 base::ScopedTempDir temp_dir_; 35 base::ScopedTempDir temp_dir_;
36 scoped_ptr<WebAppsTable> table_; 36 scoped_ptr<WebAppsTable> table_;
37 scoped_ptr<WebDatabase> db_; 37 scoped_ptr<WebDatabase> db_;
38 38
39 private: 39 private:
40 DISALLOW_COPY_AND_ASSIGN(WebAppsTableTest); 40 DISALLOW_COPY_AND_ASSIGN(WebAppsTableTest);
41 }; 41 };
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ASSERT_EQ(16, images[0].height()); 119 ASSERT_EQ(16, images[0].height());
120 ASSERT_EQ(32, images[1].width()); 120 ASSERT_EQ(32, images[1].width());
121 ASSERT_EQ(32, images[1].height()); 121 ASSERT_EQ(32, images[1].height());
122 } else { 122 } else {
123 ASSERT_EQ(32, images[0].width()); 123 ASSERT_EQ(32, images[0].width());
124 ASSERT_EQ(32, images[0].height()); 124 ASSERT_EQ(32, images[0].height());
125 ASSERT_EQ(16, images[1].width()); 125 ASSERT_EQ(16, images[1].width());
126 ASSERT_EQ(16, images[1].height()); 126 ASSERT_EQ(16, images[1].height());
127 } 127 }
128 } 128 }
OLDNEW
« no previous file with comments | « chrome/browser/webdata/web_apps_table.cc ('k') | chrome/browser/webdata/web_data_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698