Move ServiceAccessType into //components/keyed_service

chrome/browser/bookmarks/bookmark_html_writer_unittest.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 "chrome/browser/bookmarks/bookmark_html_writer.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/time_formatting.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
@@ skipping 178 matching lines @@
   GURL url3("http://url3");
   GURL url4("javascript:alert(\"Hello!\");");
   GURL unnamed_bookmark_url("about:blank");
   base::Time t1(base::Time::Now());
   base::Time t2(t1 + base::TimeDelta::FromHours(1));
   base::Time t3(t1 + base::TimeDelta::FromHours(1));
   base::Time t4(t1 + base::TimeDelta::FromHours(1));
   const BookmarkNode* f1 = model->AddFolder(
       model->bookmark_bar_node(), 0, f1_title);
   model->AddURLWithCreationTimeAndMetaInfo(f1, 0, url1_title, url1, t1, NULL);
-  HistoryServiceFactory::GetForProfile(&profile, Profile::EXPLICIT_ACCESS)->
-      AddPage(url1, base::Time::Now(), history::SOURCE_BROWSED);
-  FaviconServiceFactory::GetForProfile(&profile, Profile::EXPLICIT_ACCESS)
-      ->SetFavicons(url1,
-                    url1_favicon,
-                    favicon_base::FAVICON,
+  HistoryServiceFactory::GetForProfile(&profile,
+                                       ServiceAccessType::EXPLICIT_ACCESS)
+      ->AddPage(url1, base::Time::Now(), history::SOURCE_BROWSED);
+  FaviconServiceFactory::GetForProfile(&profile,
+                                       ServiceAccessType::EXPLICIT_ACCESS)
+      ->SetFavicons(url1, url1_favicon, favicon_base::FAVICON,
                     gfx::Image::CreateFrom1xBitmap(bitmap));
   const BookmarkNode* f2 = model->AddFolder(f1, 1, f2_title);
   model->AddURLWithCreationTimeAndMetaInfo(f2, 0, url2_title, url2, t2, NULL);
   model->AddURLWithCreationTimeAndMetaInfo(
       model->bookmark_bar_node(), 1, url3_title, url3, t3, NULL);
 
   model->AddURLWithCreationTimeAndMetaInfo(
       model->other_node(), 0, url1_title, url1, t1, NULL);
   model->AddURLWithCreationTimeAndMetaInfo(
       model->other_node(), 1, url2_title, url2, t2, NULL);
@@ skipping 12 matching lines @@
                                            NULL);
 
   base::RunLoop run_loop;
 
   // Write to a temp file.
   BookmarksObserver observer(&run_loop);
   bookmark_html_writer::WriteBookmarks(&profile, path_, &observer);
   run_loop.Run();
 
   // Clear favicon so that it would be read from file.
-  FaviconServiceFactory::GetForProfile(&profile, Profile::EXPLICIT_ACCESS)
+  FaviconServiceFactory::GetForProfile(&profile,
+                                       ServiceAccessType::EXPLICIT_ACCESS)
       ->SetFavicons(url1, url1_favicon, favicon_base::FAVICON, gfx::Image());
 
   // Read the bookmarks back in.
   std::vector<ImportedBookmarkEntry> parsed_bookmarks;
   std::vector<ImportedFaviconUsage> favicons;
   bookmark_html_reader::ImportBookmarksFile(base::Callback<bool(void)>(),
                                             base::Callback<bool(const GURL&)>(),
                                             path_,
                                             &parsed_bookmarks,
                                             &favicons);
@@ skipping 34 matching lines @@
   AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,
                             f3_title, f4_title, base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[7], false, url1, url1_title, t1,
                             base::string16(), base::string16(),
                             base::string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[8], false, unnamed_bookmark_url,
                             unnamed_bookmark_title, t2,
                             base::string16(), base::string16(),
                             base::string16());
 }