Move extension notifications to extensions/browser/notification_types.h

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

 // Copyright (c) 2013 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.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
 #include <deque>
 #include <string>
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_value_converter.h"
 #include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_manager/drive_test_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/api/test/test_api.h"
+#include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
 using drive::DriveIntegrationServiceFactory;
 
 namespace file_manager {
 namespace {
@@ skipping 420 matching lines @@
 class FileManagerTestListener : public content::NotificationObserver {
  public:
   struct Message {
     int type;
     std::string message;
     scoped_refptr<extensions::TestSendMessageFunction> function;
   };
 
   FileManagerTestListener() {
     registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_TEST_PASSED,
+                   extensions::NOTIFICATION_EXTENSION_TEST_PASSED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_TEST_FAILED,
+                   extensions::NOTIFICATION_EXTENSION_TEST_FAILED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE,
+                   extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE,
                    content::NotificationService::AllSources());
   }
 
   Message GetNextMessage() {
     if (messages_.empty())
       content::RunMessageLoop();
     const Message entry = messages_.front();
     messages_.pop_front();
     return entry;
   }
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     Message entry;
     entry.type = type;
-    entry.message = type != chrome::NOTIFICATION_EXTENSION_TEST_PASSED ?
-        *content::Details<std::string>(details).ptr() :
-        std::string();
-    entry.function = type == chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE ?
-        content::Source<extensions::TestSendMessageFunction>(source).ptr() :
-        NULL;
+    entry.message = type != extensions::NOTIFICATION_EXTENSION_TEST_PASSED
+                        ? *content::Details<std::string>(details).ptr()
+                        : std::string();
+    entry.function =
+        type == extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE
+            ? content::Source<extensions::TestSendMessageFunction>(source).ptr()
+            : NULL;
     messages_.push_back(entry);
     base::MessageLoopForUI::current()->Quit();
   }
 
  private:
   std::deque<Message> messages_;
   content::NotificationRegistrar registrar_;
 };
 
 // The base test class.
@@ skipping 87 matching lines @@
 
   RunTestMessageLoop();
 }
 
 void FileManagerBrowserTestBase::RunTestMessageLoop() {
   // Handle the messages from JavaScript.
   // The while loop is break when the test is passed or failed.
   FileManagerTestListener listener;
   while (true) {
     FileManagerTestListener::Message entry = listener.GetNextMessage();
-    if (entry.type == chrome::NOTIFICATION_EXTENSION_TEST_PASSED) {
+    if (entry.type == extensions::NOTIFICATION_EXTENSION_TEST_PASSED) {
       // Test succeed.
       break;
-    } else if (entry.type == chrome::NOTIFICATION_EXTENSION_TEST_FAILED) {
+    } else if (entry.type == extensions::NOTIFICATION_EXTENSION_TEST_FAILED) {
       // Test failed.
       ADD_FAILURE() << entry.message;
       break;
     }
 
     // Parse the message value as JSON.
     const scoped_ptr<const base::Value> value(
         base::JSONReader::Read(entry.message));
 
     // If the message is not the expected format, just ignore it.
@@ skipping 825 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) {
   AddScript("gallery/photo_editor.js");
   set_test_case_name("exposureImageOnDrive");
   StartTest();
 }
 
 }  // namespace
 }  // namespace file_manager