Revert of Don't create a sync node when updating an URL that wasn't typed.

chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/number_formatting.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 359 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   // Both clients should have this URL as typed and have two visits synced up.
   ASSERT_TRUE(CheckClientsEqual());
   urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
   ASSERT_EQ(new_url, urls[0].url());
   ASSERT_EQ(2, GetVisitCountForFirstURL(0));
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest,
-                       DontSyncUpdatedNonTypedURLs) {
-  // Checks if a non-typed URL that has been updated (modified) doesn't get
-  // synced. This is a regression test after fixing a bug where adding a
-  // non-typed URL was guarded against but later modifying it was not. Since
-  // "update" is "update or create if missing", non-typed URLs were being
-  // created.
-  const GURL kNonTypedURL("http://link.google.com/");
-  const GURL kTypedURL("http://typed.google.com/");
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  AddUrlToHistoryWithTransition(0, kNonTypedURL, ui::PAGE_TRANSITION_LINK,
-                                history::SOURCE_BROWSED);
-  AddUrlToHistoryWithTransition(0, kTypedURL, ui::PAGE_TRANSITION_TYPED,
-                                history::SOURCE_BROWSED);
-
-  // Modify the non-typed URL. It should not get synced.
-  typed_urls_helper::SetPageTitle(0, kNonTypedURL, "Welcome to Non-Typed URL");
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLsAsVerifier());
-
-  history::VisitVector visits;
-  // First client has both visits.
-  visits = typed_urls_helper::GetVisitsForURLFromClient(0, kNonTypedURL);
-  ASSERT_EQ(1U, visits.size());
-  EXPECT_TRUE(ui::PageTransitionCoreTypeIs(visits[0].transition,
-                                           ui::PAGE_TRANSITION_LINK));
-  visits = typed_urls_helper::GetVisitsForURLFromClient(0, kTypedURL);
-  ASSERT_EQ(1U, visits.size());
-  EXPECT_TRUE(ui::PageTransitionCoreTypeIs(visits[0].transition,
-                                           ui::PAGE_TRANSITION_TYPED));
-  // Second client has only the typed visit.
-  visits = typed_urls_helper::GetVisitsForURLFromClient(1, kNonTypedURL);
-  ASSERT_EQ(0U, visits.size());
-  visits = typed_urls_helper::GetVisitsForURLFromClient(1, kTypedURL);
-  ASSERT_EQ(1U, visits.size());
-  EXPECT_TRUE(ui::PageTransitionCoreTypeIs(visits[0].transition,
-                                           ui::PAGE_TRANSITION_TYPED));
-}
-
 IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, SyncTypedRedirects) {
   const base::string16 kHistoryUrl(ASCIIToUTF16("http://typed.google.com/"));
   const base::string16 kRedirectedHistoryUrl(
       ASCIIToUTF16("http://www.typed.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Simulate a typed address that gets redirected by the server to a different
   // address.
   GURL initial_url(kHistoryUrl);
   const ui::PageTransition initial_transition = ui::PageTransitionFromInt(
@@ skipping 96 matching lines @@
   // - this should not cause a crash.
   AddUrlToHistory(0, bookmark_url);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLsAsVerifier());
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
   ASSERT_EQ(bookmark_url, urls[0].url());
   ASSERT_EQ(1, GetVisitCountForFirstURL(0));
 }