chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc - Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/search_engines/keyword_editor_controller.cc ('k') | chrome/browser/ui/search_engines/template_url_table_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

===================================================================

--- chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc (revision 130565)

+++ chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc (working copy)

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -142,7 +142,8 @@

const TemplateURL* turl = model_->GetTemplateURLs()[0];

EXPECT_EQ(ASCIIToUTF16("a"), turl->short_name());

EXPECT_EQ(ASCIIToUTF16("b"), turl->keyword());

- EXPECT_EQ("http://c", turl->url());

+ ASSERT_TRUE(turl->url() != NULL);

+ EXPECT_EQ("http://c", turl->url()->url());

}

// Tests modifying a TemplateURL.

@@ -158,7 +159,8 @@

VerifyChangeCount(0, 1, 0, 0);

EXPECT_EQ(ASCIIToUTF16("a1"), turl->short_name());

EXPECT_EQ(ASCIIToUTF16("b1"), turl->keyword());

- EXPECT_EQ("http://c1", turl->url());

+ ASSERT_TRUE(turl->url() != NULL);

+ EXPECT_EQ("http://c1", turl->url()->url());

}

// Tests making a TemplateURL the default search provider.

@@ -197,7 +199,7 @@

EXPECT_TRUE(controller_->CanMakeDefault(turl1));

EXPECT_TRUE(controller_->CanMakeDefault(turl2));

- SimulateDefaultSearchIsManaged(turl2->url());

+ SimulateDefaultSearchIsManaged(turl2->url()->url());

EXPECT_TRUE(model_->is_default_search_managed());

EXPECT_FALSE(controller_->CanMakeDefault(turl1));

@@ -223,7 +225,7 @@

// Simulate setting a managed default. This will add another template URL to

// the model.

- SimulateDefaultSearchIsManaged(turl2->url());

+ SimulateDefaultSearchIsManaged(turl2->url()->url());

EXPECT_TRUE(model_->is_default_search_managed());

EXPECT_TRUE(controller_->CanEdit(turl1));

EXPECT_TRUE(controller_->CanEdit(turl2));